summaryrefslogtreecommitdiff
path: root/lib/api/projects.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-05-11 12:40:44 -0700
committerStan Hu <stanhu@gmail.com>2017-05-11 12:40:44 -0700
commite3bac7dffe87a6e5adb1b51700acedba09420515 (patch)
tree3cad0696bdfeb79609c0442f79708fbbed2d93f1 /lib/api/projects.rb
parentf4b6bc06da18bce9553032463ca2012d7cad7268 (diff)
parente7e132529bff3af38175076b84c818b6dea4b05f (diff)
downloadgitlab-ce-sh-ajax-tests.tar.gz
Merge branch 'master' into sh-ajax-testssh-ajax-tests
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r--lib/api/projects.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 9a6cb43abf7..ed5004e8d1a 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -69,7 +69,7 @@ module API
options = options.reverse_merge(
with: Entities::Project,
current_user: current_user,
- simple: params[:simple],
+ simple: params[:simple]
)
projects = filter_projects(projects)
@@ -226,7 +226,7 @@ module API
:shared_runners_enabled,
:snippets_enabled,
:visibility,
- :wiki_enabled,
+ :wiki_enabled
]
optional :name, type: String, desc: 'The name of the project'
optional :default_branch, type: String, desc: 'The default branch of the project'