diff options
author | Guilherme Vieira <guilherme@flipstudio.net> | 2017-09-23 16:21:32 +0300 |
---|---|---|
committer | Guilherme Vieira <guilherme@flipstudio.net> | 2017-10-13 00:46:41 +0300 |
commit | 771b777ab57d1c8d323ecc08a9e2cdc4f6a01e0b (patch) | |
tree | 63bc53b8c03078b5a40e3e67457d341cc5e337ff /lib/api/api.rb | |
parent | b14641579855a14398db260ab909ae77c164c883 (diff) |
Adds requirements that supports anything in sha params
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r-- | lib/api/api.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 79e55a2f4f7..99fcc59ba04 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -4,6 +4,10 @@ module API LOG_FILENAME = Rails.root.join("log", "api_json.log") + NO_SLASH_URL_PART_REGEX = %r{[^/]+} + PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze + COMMIT_ENDPOINT_REQUIREMENTS = PROJECT_ENDPOINT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze + use GrapeLogging::Middleware::RequestLogger, logger: Logger.new(LOG_FILENAME), formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new, @@ -96,9 +100,6 @@ module API helpers ::API::Helpers helpers ::API::Helpers::CommonHelpers - NO_SLASH_URL_PART_REGEX = %r{[^/]+} - PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze - # Keep in alphabetical order mount ::API::AccessRequests mount ::API::AwardEmoji |