diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-18 17:25:24 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-18 17:25:24 +0100 |
| commit | 7f0f8594d3e5cbee41771c476e3b7496946db300 (patch) | |
| tree | 1981c15675409386908b3b05d4f1aa75b1755957 /lib/api/api.rb | |
| parent | 068186555cb85e85bbfe04afe858fb3eb4801207 (diff) | |
| parent | 8bacfbd1cc4f6c3678d50dd516df2b59eb0c8864 (diff) | |
| download | gitlab-ce-5845-extract-ee-environments-files.tar.gz | |
Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-files
* master: (69 commits)
Calculating repository checksums executed by Gitaly
Resolve "Expand API: Render an arbitrary Markdown document"
Update EE > CE downgrade service removal steps
Make stores export a createStore() which can be used in tests
Simplify pattern lexeme fabrication and matcher
Simplify untrusted regexp factory method
Fix api_json.log not always reporting the right HTTP status code
Move group lists css from framework/lists.scss to pages/groups.scss
Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"
Add Keyboard shortcuts for "Kubernetes" and "Environments"
Move API group deletion to Sidekiq
fix typos. add a reference to deliverable and stretch for design artifact
fix / assigne username wrapping problem has been fixed
Memoize Gitlab::Database.version
Conditionally add Gitaly deprecation warnings based on ENV variable
Bring CE-EE parity to app/services/milestones/base_service.rb
Bring CE-EE parity to app/services/lfs/unlock_file_service.rb
Fixes 500 error on /estimate BIG_VALUE
Fix: Use case in-sensitive ordering by name for groups
Fix group lists visual
...
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 5139e869c71..de20b2b8e67 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -8,14 +8,15 @@ module API 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, - include: [ - GrapeLogging::Loggers::FilterParameters.new, - GrapeLogging::Loggers::ClientEnv.new, - Gitlab::GrapeLogging::Loggers::UserLogger.new - ] + insert_before Grape::Middleware::Error, + GrapeLogging::Middleware::RequestLogger, + logger: Logger.new(LOG_FILENAME), + formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new, + include: [ + GrapeLogging::Loggers::FilterParameters.new, + GrapeLogging::Loggers::ClientEnv.new, + Gitlab::GrapeLogging::Loggers::UserLogger.new + ] allow_access_with_scope :api prefix :api @@ -139,6 +140,7 @@ module API mount ::API::Keys mount ::API::Labels mount ::API::Lint + mount ::API::Markdown mount ::API::Members mount ::API::MergeRequestDiffs mount ::API::MergeRequests |