From 27f2ca94181880861269a7ddc07ae0d50a656d35 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Sun, 29 Jan 2017 13:38:00 -0600 Subject: Add 'View on [env]' link to blobs and individual files in diffs --- app/controllers/projects/commit_controller.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/controllers/projects/commit_controller.rb') diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index b5a7078a3a1..08817afa1e9 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -95,6 +95,9 @@ class Projects::CommitController < Projects::ApplicationController @diffs = commit.diffs(opts) @notes_count = commit.notes.count + + @environment = @project.latest_environment_for(@commit) + @environment = nil unless can?(current_user, :read_environment, @environment) end def define_note_vars -- cgit v1.2.1 From c8b63a28afa811881b617546fe94a19378585a04 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 30 Jan 2017 18:26:40 -0600 Subject: Improve performance of finding last deployed environment --- app/controllers/projects/commit_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/commit_controller.rb') diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 08817afa1e9..5bcc545462f 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -96,7 +96,7 @@ class Projects::CommitController < Projects::ApplicationController @diffs = commit.diffs(opts) @notes_count = commit.notes.count - @environment = @project.latest_environment_for(@commit) + @environment = @project.environments_for(commit: @commit).last @environment = nil unless can?(current_user, :read_environment, @environment) end -- cgit v1.2.1 From 9d7c5e75841eff48217487b3acda56cf265a2aef Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 6 Feb 2017 18:06:46 -0600 Subject: Address feedback --- app/controllers/projects/commit_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/controllers/projects/commit_controller.rb') diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 5bcc545462f..aade1b6c256 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -95,9 +95,8 @@ class Projects::CommitController < Projects::ApplicationController @diffs = commit.diffs(opts) @notes_count = commit.notes.count - - @environment = @project.environments_for(commit: @commit).last - @environment = nil unless can?(current_user, :read_environment, @environment) + + @environment = EnvironmentsFinder.new(@project, current_user, commit: @commit).execute.last end def define_note_vars -- cgit v1.2.1