Merge branch 'master' into feature/useXMLHttpRequest

Author: Mr-Wallet

README.md

@@ -373,26 +373,36 @@ This started off as a fork from [node-gitlab](https://github.com/node-gitlab/nod
 - [Claude Abounegm](https://github.com/claude-abounegm)
 - [Stefan Hall](https://github.com/Marethyu1)
 - [Jordan Wallet](https://github.com/Mr-Wallet)
+- [Ev Haus](https://github.com/EvHaus) 
+- [zhao0](https://github.com/zhao0)
 - [Joshua Grosso](https://github.com/jgrosso)
 
-
 ## License
 
 [MIT](https://github.com/jdalrymple/node-gitlab-api/blob/master/LICENSE.md)
 
 ## Changelog
 
+[3.0.4](https://github.com/jdalrymple/node-gitlab-api/tags/3.0.4) (2018-4-13)
+------------------
+- Fixed endpoint for MergeRequestNotes thanks to [Ev Haus](https://github.com/EvHaus) in PR [#63](https://github.com/jdalrymple/node-gitlab-api/pull/63)
+- Fixed Commits.editStatus method thanks to [zhao0](https://github.com/zhao0) in PR [#65](https://github.com/jdalrymple/node-gitlab-api/pull/65)
+
+[3.0.3](https://github.com/jdalrymple/node-gitlab-api/tags/3.0.3) (2018-4-5)
+------------------
+- Fixed the problem with the validation of Event resource options
+
 [3.0.0](https://github.com/jdalrymple/node-gitlab-api/tags/3.0.0) (2018-4-2)
 ------------------
 - Exporting all services seperatly ie. const { Projects } from 'node-gitlab-api'; as well as the usual default export: const Gitlab from 'node-gitlab-api'
 - Exporting bunbles which are groups of related API's. These include: ProjectsBundle, UsersBundle and GroupsBundle
 - Added events support to the Projects, and Users
 - Added full support for ProjectVariables and GroupVariables
 - Added support for Events. This is also exposed in Projects and Users under the events function
-- Fixed the missing options parameter for the ProjectMembers and GroupMemebers APIs in PR [#45] thanks to [Stefan Hall](https://github.com/Marethyu1)
+- Fixed the missing options parameter for the ProjectMembers and GroupMemebers APIs in PR [#45](https://github.com/jdalrymple/node-gitlab-api/pull/45) thanks to [Stefan Hall](https://github.com/Marethyu1)
 - Supporting both camelCase and snake_case option properties: `projects.all({perPage:5}) === projects.all({per_page: 5})`
 - Fixed problem with .all() functions where only the some of the results were being returned
-- Completed support for all Gitlab APIs, #49, #53
+- Completed support for all Gitlab APIs, [#49](https://github.com/jdalrymple/node-gitlab-api/pull/49), [#53](https://github.com/jdalrymple/node-gitlab-api/pull/53)
 
 ### Breaking Changes between 2.2.6 and 3.0.0
 - Instantiation of the API must use the new operator consistently. See usage above.
@@ -441,23 +451,11 @@ Runners = ProjectRunners + Runners. ProjectId is optional for all()
 ------------------
 - Fixed #48 - Problem with trailing `\` in url
 
-[2.2.4](https://github.com/jdalrymple/node-gitlab-api/5d7c031ca2b833b28633647195560379d88ba5b3) (2018-2-12)
-------------------
-- Fixing babel runtime
-
-[2.2.6](https://github.com/jdalrymple/node-gitlab-api/tags/2.2.6) (2018-3-15)
-------------------
-- Fixed more issues within the url concatenation
-
-[2.2.5](https://github.com/jdalrymple/node-gitlab-api/tags/2.2.5) (2018-3-15)
-------------------
-- Fixed #48 - Problem with trailing `\` in url
-
 [2.2.4](https://github.com/jdalrymple/node-gitlab-api/ce7f17693168b5dec3b36eb1d5ab796c9374613f) (2018-2-3)
 ------------------
 - Fixed #33 - Bug within the es5 transpilling configuration
-- Fixed the missing options for tags.all #40
-- Added delete key method to UserKeys.js #41 thanks to [Claude Abounegm](https://github.com/claude-abounegm)
+- Fixed the missing options for tags.all [#40](https://github.com/jdalrymple/node-gitlab-api/pull/40)
+- Added delete key method to UserKeys.js [#41](https://github.com/jdalrymple/node-gitlab-api/pull/41) thanks to [Claude Abounegm](https://github.com/claude-abounegm)
 
 [2.2.3](https://github.com/jdalrymple/node-gitlab-api/ce7f17693168b5dec3b36eb1d5ab796c9374613f) (2018-2-3)
 ------------------
@@ -608,7 +606,7 @@ inferred from the file path
 
 [1.0.10](https://github.com/jdalrymple/node-gitlab-api/commit/c4a55aba89d83fda1552b3d5688b090b0c2b60aa) (2017-07-13)
 ------------------
-- Fixing Issues #1, #2, and #3
+- Fixing Issues [#1](https://github.com/jdalrymple/node-gitlab-api/pull/1), [#2](https://github.com/jdalrymple/node-gitlab-api/pull/3), and [#3](https://github.com/jdalrymple/node-gitlab-api/pull/3)
 
 [1.0.9](https://github.com/jdalrymple/node-gitlab-api/commit/7a90dbb6354fe956fff37c56f938a833e3fc5ea1) (2017-07-06)
 ------------------

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab",
-  "version": "3.0.1",
+  "version": "3.0.4",
   "description": "Full NodeJS implementation of the GitLab API. Supports Promises, Async/Await.",
   "main": "dist/latest/index.js",
   "engines": {

package.json

@@ -48,7 +48,7 @@ class Commits extends BaseService {
   editStatus(projectId, sha, options) {
     const pId = encodeURIComponent(projectId);
 
-    return RequestHelper.get(this, `projects/${pId}/repository/commits/${sha}/statuses`, options);
+    return RequestHelper.post(this, `projects/${pId}/statuses/${sha}`, options);
   }
 
   references(projectId, sha) {

src/services/Commits.js

@@ -25,11 +25,11 @@ const TARGET_TYPES = [
 ];
 
 function validateEventOptions(action, target) {
-  if (!ACTION_TYPES.includes(action)) {
+  if (action && !ACTION_TYPES.includes(action)) {
     throw new Error(`This action is not supported. Pleased use one of following options: ${ACTION_TYPES}`);
   }
 
-  if (!TARGET_TYPES.includes(target)) {
+  if (target && !TARGET_TYPES.includes(target)) {
     throw new Error(`This target is not supported. Pleased use one of following options: ${TARGET_TYPES}`);
   }
 }

src/services/Events.js

@@ -2,7 +2,7 @@ import { ResourceNotes } from '../templates';
 
 class MergeRequestNotes extends ResourceNotes {
   constructor(options) {
-    super('projects', 'mergerequests', options);
+    super('projects', 'merge_requests', options);
   }
 }
 

src/services/MergeRequestNotes.js

@@ -1,6 +1,6 @@
 import { BaseService, RequestHelper } from '../infrastructure';
 
-const url = userId => (userId ? `users/${encodeURIComponent(userId)}/emails` : 'users/emails');
+const url = userId => (userId ? `users/${encodeURIComponent(userId)}/emails` : 'user/emails');
 
 class UserEmails extends BaseService {
   all({ userId } = {}) {
@@ -16,7 +16,7 @@ class UserEmails extends BaseService {
   show(emailId) {
     const eId = encodeURIComponent(emailId);
 
-    return RequestHelper.get(this, `users/emails/${eId}`);
+    return RequestHelper.get(this, `user/emails/${eId}`);
   }
 
   remove(emailId, { userId } = {}) {

src/services/UserEmails.js

@@ -1,6 +1,6 @@
 import { BaseService, RequestHelper } from '../infrastructure';
 
-const url = userId => (userId ? `users/${encodeURIComponent(userId)}/keys` : 'users/keys');
+const url = userId => (userId ? `users/${encodeURIComponent(userId)}/keys` : 'user/keys');
 
 class UserKeys extends BaseService {
   all({ userId }) {