diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-03 17:00:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-15 09:50:33 +0100 |
| commit | 64fd9266cf44c3806970beb843a595a5dacf0707 (patch) | |
| tree | 54c0008b404a1d31b4cab83b48ea269fdc489892 | |
| parent | 167a00cf6ba5521c740a2c8816f77da5be271bab (diff) | |
| download | gitlab-ce-64fd9266cf44c3806970beb843a595a5dacf0707.tar.gz | |
Merge branch '27267-unnecessary-queries-from-projects-dashboard-atom-and-json' into 'master'
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
Closes #27267
See merge request !8956
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/27267-unnecessary-queries-from-projects-dashboard-atom-and-json.yml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index c08eb811532..3ba8c2f8bb9 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -10,10 +10,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = @projects.sort(@sort = params[:sort]) @projects = @projects.page(params[:page]) - @last_push = current_user.recent_push - respond_to do |format| - format.html + format.html { @last_push = current_user.recent_push } format.atom do event_filter load_events diff --git a/changelogs/unreleased/27267-unnecessary-queries-from-projects-dashboard-atom-and-json.yml b/changelogs/unreleased/27267-unnecessary-queries-from-projects-dashboard-atom-and-json.yml new file mode 100644 index 00000000000..7b307b501f4 --- /dev/null +++ b/changelogs/unreleased/27267-unnecessary-queries-from-projects-dashboard-atom-and-json.yml @@ -0,0 +1,4 @@ +--- +title: Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index +merge_request: 8956 +author: |