From 139ff5783b2eb2ff4b63a2f6c30695830a3984ff Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 27 Dec 2016 12:03:44 -0500 Subject: Preserve selected versions when comparing MR changes --- app/controllers/projects/merge_requests_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/controllers/projects') 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 -- cgit v1.2.1 From 3f4055f6d4c24fa081843f47f48f8b5ea7f70ca0 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Thu, 22 Dec 2016 12:00:27 +0100 Subject: Use stable icon for Mattermost integration --- app/controllers/projects/mattermosts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index d87dff2a80e..27f67ffb311 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('apple-touch-icon.png')) end def teams -- cgit v1.2.1 From b0667332ca260dca54b612f4f0b7f664ff000693 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Fri, 23 Dec 2016 11:56:33 +0100 Subject: Add logo in public files --- app/controllers/projects/mattermosts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index 27f67ffb311..bddfa6ebe0f 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('apple-touch-icon.png')) + icon_url: asset_url('mattermost-command-logo.png')) end def teams -- cgit v1.2.1 From 05228dddffbfe7863e129d8778c83c203d9fd883 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Thu, 29 Dec 2016 10:58:27 +0100 Subject: Rename logo, apply for Slack too --- app/controllers/projects/mattermosts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index bddfa6ebe0f..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('mattermost-command-logo.png')) + icon_url: asset_url('slash-command-logo.png')) end def teams -- cgit v1.2.1