diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /app/controllers/projects_controller.rb | |
parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a93b116c6fe..efb30ba4715 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -247,13 +247,13 @@ class ProjectsController < Projects::ApplicationController if find_branches branches = BranchesFinder.new(@repository, params).execute.take(100).map(&:name) - options[s_('RefSwitcher|Branches')] = branches + options['Branches'] = branches end if find_tags && @repository.tag_count.nonzero? tags = TagsFinder.new(@repository, params).execute.take(100).map(&:name) - options[s_('RefSwitcher|Tags')] = tags + options['Tags'] = tags end # If reference is commit id - we should add it to branch/tag selectbox |