Commit d00bfa7c authored by Robert Speicher's avatar Robert Speicher

Resolve lib/api/helpers/projects_helpers.rb

parent 84574633
...@@ -27,7 +27,6 @@ module API ...@@ -27,7 +27,6 @@ module API
optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line' optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line'
optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests' optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests'
optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md" optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md"
<<<<<<< HEAD
end end
params :optional_project_params_ee do params :optional_project_params_ee do
...@@ -36,8 +35,6 @@ module API ...@@ -36,8 +35,6 @@ module API
optional :external_authorization_classification_label, type: String, desc: 'The classification label for the project' optional :external_authorization_classification_label, type: String, desc: 'The classification label for the project'
optional :mirror, type: Boolean, desc: 'Enables pull mirroring in a project' optional :mirror, type: Boolean, desc: 'Enables pull mirroring in a project'
optional :mirror_trigger_builds, type: Boolean, desc: 'Pull mirroring triggers builds' optional :mirror_trigger_builds, type: Boolean, desc: 'Pull mirroring triggers builds'
=======
>>>>>>> upstream/master
end end
params :optional_project_params do params :optional_project_params do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment