diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 12:19:32 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 12:19:32 +0300 |
commit | 183892fde98308c0d77f5ba7a9bdb23d79eebe43 (patch) | |
tree | 9cc63e2422b514e33337e9c3288c965a22bf7f97 /app/controllers | |
parent | 2460d290af892a24996b348c786757eb5398adc1 (diff) | |
parent | 47e926bec0a9da28daaca7dc92415b25f2301daf (diff) |
Merge branch 'notification-levels' into 'master'
Notification levels can now be set on the Project's main page
![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f4d1a828aab..213c2a7173b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -86,6 +86,10 @@ class ProjectsController < ApplicationController if @project.empty_repo? render 'projects/empty' else + if current_user + @membership = @project.project_member_by_id(current_user.id) + end + render :show end else |