diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-04 10:55:25 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-04 10:55:25 -0700 |
| commit | 1655824fa44c428b9570dc96688d27faef186024 (patch) | |
| tree | 14bbb2ba241efbabef6def3b3415f9f1b6851d3a /app/controllers/projects | |
| parent | cf039f58585e5238cd979ba70a5fd2d5c1eee650 (diff) | |
| parent | ec4fe4432a2c4daa14c8e8f7c5d8567553062ebf (diff) | |
| download | gitlab-ce-1655824fa44c428b9570dc96688d27faef186024.tar.gz | |
Merge branch 'master' into auto-pipelines-vue
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/mattermosts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index d87dff2a80e..01d99c7df35 100644 --- a/app/controllers/projects/mattermosts_controller.rb +++ b/app/controllers/projects/mattermosts_controller.rb @@ -30,7 +30,7 @@ class Projects::MattermostsController < Projects::ApplicationController def configure_params params.require(:mattermost).permit(:trigger, :team_id).merge( url: service_trigger_url(@service), - icon_url: asset_url('gitlab_logo.png')) + icon_url: asset_url('slash-command-logo.png')) end def teams diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fc8a289d49d..6004e7d7115 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -98,7 +98,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha } unless @start_version - render_404 + @start_sha = @merge_request_diff.head_commit_sha + @start_version = @merge_request_diff end end |