diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-09 22:25:46 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-09 22:25:52 +0200 |
| commit | 8f75ab21d021fb5335ed9e084157cf2bc06caca1 (patch) | |
| tree | 5420fb7bc253329e65c14c99c4c926a7c5128d9d | |
| parent | 40c8295a24aace3210a8bc485f853d556a8bdc5c (diff) | |
| download | gitlab-ce-8f75ab21d021fb5335ed9e084157cf2bc06caca1.tar.gz | |
Link Commits tab to current branch from Compare page.
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/commits/_head.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 7c20b81c0b1..c5f085c236f 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -6,11 +6,12 @@ class Projects::CompareController < Projects::ApplicationController before_action :authorize_download_code! def index + @ref = Addressable::URI.unescape(params[:to]) end def show base_ref = Addressable::URI.unescape(params[:from]) - head_ref = Addressable::URI.unescape(params[:to]) + @ref = head_ref = Addressable::URI.unescape(params[:to]) compare_result = CompareService.new.execute( current_user, diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml index a714f5f79e0..66101f3f0da 100644 --- a/app/views/projects/commits/_head.html.haml +++ b/app/views/projects/commits/_head.html.haml @@ -1,6 +1,6 @@ %ul.nav.nav-tabs = nav_link(controller: [:commit, :commits]) do - = link_to namespace_project_commits_path(@project.namespace, @project, @repository.root_ref) do + = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do Commits %span.badge= number_with_precision(@repository.commit_count, precision: 0, delimiter: ',') = nav_link(controller: :compare) do |