diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-11-18 11:17:20 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-11-18 11:17:20 +0100 |
commit | e86d53b27f6d46e818b6008d1274d1c4899a7a71 (patch) | |
tree | 056dd5f3944ad9221d69c668ddfea7acb46d767d /app/controllers/concerns | |
parent | b6251af40fa8ffdc9e85f5ed4c279774fe0ecaaf (diff) | |
parent | 21a59b23fe4d8bc4331f746c75f9242a49d75faa (diff) | |
download | gitlab-ce-e86d53b27f6d46e818b6008d1274d1c4899a7a71.tar.gz |
Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/issues_action.rb | 14 | ||||
-rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 9 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb new file mode 100644 index 00000000000..effd4721949 --- /dev/null +++ b/app/controllers/concerns/issues_action.rb @@ -0,0 +1,14 @@ +module IssuesAction + extend ActiveSupport::Concern + + def issues + @issues = get_issues_collection + @issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE) + @issues = @issues.preload(:author, :project) + + respond_to do |format| + format.html + format.atom { render layout: false } + end + end +end diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb new file mode 100644 index 00000000000..f7a25111db9 --- /dev/null +++ b/app/controllers/concerns/merge_requests_action.rb @@ -0,0 +1,9 @@ +module MergeRequestsAction + extend ActiveSupport::Concern + + def merge_requests + @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) + end +end |