diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:54:59 -0600 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:19 -0600 |
commit | 56de781a2cef437b6e1af748dc0c231af74e044d (patch) | |
tree | c8186a283904e3cc7461c4289cd2e1a8a9daa69c /app/controllers/concerns | |
parent | 1fe7501b49f896b74102c4b970310aa9ae34da85 (diff) | |
download | gitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz |
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
# .rubocop.yml
# .rubocop_todo.yml
# lib/gitlab/ci/config/entry/global.rb
# lib/gitlab/ci/config/entry/jobs.rb
# spec/lib/gitlab/ci/config/entry/factory_spec.rb
# spec/lib/gitlab/ci/config/entry/global_spec.rb
# spec/lib/gitlab/ci/config/entry/job_spec.rb
# spec/lib/gitlab/ci/status/build/factory_spec.rb
# spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/issues_action.rb | 6 | ||||
-rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index 8b985b6d003..b17c138d5c7 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -5,9 +5,9 @@ module IssuesAction def issues @label = issues_finder.labels.first - @issues = issues_collection. - non_archived. - page(params[:page]) + @issues = issues_collection + .non_archived + .page(params[:page]) @collection_type = "Issue" @issuable_meta_data = issuable_meta_data(@issues, @collection_type) diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index 28e34cffc24..d3c8e4888bc 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -5,8 +5,8 @@ module MergeRequestsAction def merge_requests @label = merge_requests_finder.labels.first - @merge_requests = merge_requests_collection. - page(params[:page]) + @merge_requests = merge_requests_collection + .page(params[:page]) @collection_type = "MergeRequest" @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type) |