summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-02-19 17:54:13 -0800
committerDouwe Maan <douwe@selenight.nl>2016-02-19 17:54:13 -0800
commit31682eb987ea6ab4f187a9e2bacb23d2ed86b1f5 (patch)
tree5a4177a685daa62164f0e0ea1902ed1a56684e5a /app/controllers/concerns
parent0c5abb1e0ba87a9e8c28dfc2f1cf455cf5b64ab9 (diff)
parentcec57275f0b96fcd5644239bfbe2773cdec0ed58 (diff)
downloadgitlab-ce-31682eb987ea6ab4f187a9e2bacb23d2ed86b1f5.tar.gz
Merge branch 'visibletrap/gitlab-ce-label'
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/issues_action.rb2
-rw-r--r--app/controllers/concerns/merge_requests_action.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb
index effd4721949..5b098628557 100644
--- a/app/controllers/concerns/issues_action.rb
+++ b/app/controllers/concerns/issues_action.rb
@@ -6,6 +6,8 @@ module IssuesAction
@issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE)
@issues = @issues.preload(:author, :project)
+ @label = @issuable_finder.labels.first
+
respond_to do |format|
format.html
format.atom { render layout: false }
diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb
index f7a25111db9..f6de696e84d 100644
--- a/app/controllers/concerns/merge_requests_action.rb
+++ b/app/controllers/concerns/merge_requests_action.rb
@@ -5,5 +5,7 @@ module MergeRequestsAction
@merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project)
+
+ @label = @issuable_finder.labels.first
end
end