diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 13:20:14 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 13:20:14 +0000 |
commit | d3978e0b27adc51c9bd5df38465a22a02d6420ea (patch) | |
tree | 81af0b8db2729ff8c083103abc9b7ee3f3e4d0ce | |
parent | 595b3323a8eda201d423a620dd29ba242c9e6131 (diff) | |
parent | 003e1d39afcebe7045dc357770d0c54d51a114a1 (diff) | |
download | gitlab-ce-d3978e0b27adc51c9bd5df38465a22a02d6420ea.tar.gz |
Merge branch 'remove_unused_except' into 'master'
projects doesn't seem to be a valid action in this controller
Hi,
This is just a tiny change. Let me know if I'm doing it wrong...
Eaden
See merge request !696
-rw-r--r-- | app/controllers/dashboard_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 17ddde68f93..d2f0c43929f 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,7 +1,7 @@ class DashboardController < Dashboard::ApplicationController - before_action :load_projects, except: [:projects] + before_action :load_projects before_action :event_filter, only: :show - + respond_to :html def show |