diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-03-17 14:19:51 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-03-17 14:19:51 -0700 |
| commit | 70f1fe6915549c94ea8bdf7ab1aed9c1c364415c (patch) | |
| tree | 045db56cfe8296e8052192324e00aa4220a58aee /app/controllers | |
| parent | 11a964ced475049de86f4f20a4dc96be5bcf6824 (diff) | |
| parent | 5d71d9fb9d6ca89710549fbfef62d105d9544a30 (diff) | |
| download | gitlab-ce-70f1fe6915549c94ea8bdf7ab1aed9c1c364415c.tar.gz | |
Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activity
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 395a8bffe92..47f7e0b1b28 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -316,6 +316,7 @@ class ProjectsController < Projects::ApplicationController :namespace_id, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, + :printing_merge_request_link_enabled, :path, :public_builds, :request_access_enabled, |