Commit b36b4f8c authored by Nick Thomas's avatar Nick Thomas

CE->EE: Fix conflicts relating to project snapshots

parent ca8f95c2
......@@ -1545,7 +1545,3 @@ GET /projects/:id/snapshot
| --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
| `wiki` | boolean | no | Whether to download the wiki, rather than project, repository |
<<<<<<< HEAD
=======
>>>>>>> upstream/master
module API
module Helpers
module ProjectSnapshotsHelpers
<<<<<<< HEAD
prepend ::EE::API::Helpers::ProjectSnapshotsHelpers
=======
>>>>>>> upstream/master
def authorize_read_git_snapshot!
authenticated_with_full_private_access!
end
......
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