diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:05:53 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:05:53 -0500 |
| commit | bb883387f9e4d5564b455cce7d412f730664a2f5 (patch) | |
| tree | 02f972c30f9a01d605e2c88a22b2c7172694e475 /app/controllers/projects_controller.rb | |
| parent | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (diff) | |
| parent | b7d83acf5b03e08dc9e387e1abb83c5e3c80444c (diff) | |
| download | gitlab-ce-bb883387f9e4d5564b455cce7d412f730664a2f5.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 85a987c2cb2..d4c2e45a5c5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -235,7 +235,8 @@ class ProjectsController < Projects::ApplicationController def project_params params.require(:project).permit( :name, :path, :description, :issues_tracker, :tag_list, :runners_token, - :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch, + :issues_enabled, :merge_requests_enabled, :snippets_enabled, :container_registry_enabled, + :issues_tracker_id, :default_branch, :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, :public_builds, |