diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 17:42:32 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 10:26:48 +0000 |
| commit | 1a482bfbc21eca3c7526cc367b86174b77e0d617 (patch) | |
| tree | 9078bbf1d5694699229dac5482ab774155e9bd7d | |
| parent | e33e0de24da8994c32ce093883003d31cef7c56e (diff) | |
| download | gitlab-ce-1a482bfbc21eca3c7526cc367b86174b77e0d617.tar.gz | |
Removes name from file
Changes `:not_found` to `nil`
| -rw-r--r-- | app/assets/javascripts/lib/notify.js.coffee | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/lib/notify.js.coffee b/app/assets/javascripts/lib/notify.js.coffee index 6b9fb9deb3b..f28fe8bbc63 100644 --- a/app/assets/javascripts/lib/notify.js.coffee +++ b/app/assets/javascripts/lib/notify.js.coffee @@ -1,5 +1,3 @@ -# Written by GitLab @gitlab - ((w) -> notifyMe = (message,body, icon) -> notification = undefined diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 987b3e1c5b6..e57471deccc 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -233,8 +233,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController end response = { - status: status || :not_found, - coverage: coverage || :not_found + status: status || nil, + coverage: coverage || nil } render json: response, status: 200 |