summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-log-422-responses' into 'master'2018-06-07-RC-cutSean McGivern2018-06-071-0/+1
|\ | | | | | | | | Log response body to production_json.log when a controller responds with a 422 status See merge request gitlab-org/gitlab-ce!19473
| * Log response body to production_json.log when a controller responds with a ↵Stan Hu2018-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | 422 status We have a number of import errors occurring with 422 errors, and it's hard to determine why they are happening. This change will surface the errors in the log lines. Relates to #47365
* | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-071-3/+8
|/
* Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-0/+3
|\ | | | | | | | | Live trace: Rescue stale live trace See merge request gitlab-org/gitlab-ce!18680
| * Rename worker to ArchiveTracesCronWorkerShinya Maeda2018-06-061-3/+3
| |
| * Fix name of worker for cron worker specShinya Maeda2018-06-061-1/+1
| |
| * Rename find_stale. Fix worker name in declaration.Shinya Maeda2018-06-061-3/+3
| |
| * Changed cron interval to every 17 minuteShinya Maeda2018-06-061-1/+1
| |
| * Change cron period to per hourShinya Maeda2018-06-061-1/+1
| |
| * Simplify RescueStaleLiveTraceWorkerShinya Maeda2018-06-061-2/+2
| |
| * Added flush-to-db process for the cron worker. Rename to ↵Shinya Maeda2018-06-061-3/+3
| | | | | | | | RescueStaleLiveTraceWorker.
| * Rescue stale live tracesShinya Maeda2018-06-061-0/+3
| |
* | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-061-2/+4
| | | | | | | | | | | | | | | | | | - All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601
* | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-6/+0
| |
* | Add a minimal GraphQL APINick Thomas2018-06-052-0/+9
|/
* Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-051-1/+8
|\ | | | | | | | | | | | | Support rails5 in postgres indexes function and fix some migrations Closes #46236 See merge request gitlab-org/gitlab-ce!19400
| * Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-051-1/+8
| |
* | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-041-9/+15
| |
* | Support presigned multipart uploadsKamil Trzciński2018-06-042-7/+13
|/
* Fix attr_encryption key settingsStan Hu2018-06-021-8/+15
| | | | | | | | | | | | | attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166
* Add comment about the need for truncating keys in Ruby 2.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
| | | | [ci skip]
* Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-012-0/+7
|\ | | | | | | | | Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
| * Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-292-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* | Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-012-6/+10
| |
* | Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-012-9/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "A lot of constants redefinition warnings" Closes #46481 See merge request gitlab-org/gitlab-ce!19286
| * | Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-011-7/+1
| | | | | | | | | | | | Which could extend from EE
| * | Eliminate constants warnings by:Lin Jen-Shin2018-06-012-6/+5
| | | | | | | | | | | | | | | * Replace `require` or `require_relative` with `require_dependency` * Remove unneeded `autoload`
* | | Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' ↵Kamil Trzciński2018-06-011-0/+69
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a monkey patch of https://github.com/carrierwaveuploader/carrierwave/pull/2314 See merge request gitlab-org/gitlab-ce!19102
| * | | Revise commentsadd-moneky-patch-for-using-stream-upload-with-carrierwaveShinya Maeda2018-05-281-3/+2
| | | |
| * | | Clean up patchShinya Maeda2018-05-281-9/+31
| | | |
| * | | Fix rubocop namespaceShinya Maeda2018-05-281-5/+5
| | | |
| * | | Reload remote file the cacheds file is already removedShinya Maeda2018-05-281-0/+3
| | | |
| * | | Use prepend to correctly use the monketpatch's methodShinya Maeda2018-05-281-24/+28
| | | |
| * | | Fix static analysisShinya Maeda2018-05-281-5/+5
| | | |
| * | | Add a monkey pach of ↵Shinya Maeda2018-05-281-0/+41
| | | | | | | | | | | | | | | | https://github.com/carrierwaveuploader/carrierwave/pull/2314
* | | | Update 404 and 403 pagesPaul Slaughter2018-05-311-0/+1
| |/ / |/| |
* | | Export assigned issues in iCalendar feedImre Farkas2018-05-314-2/+5
| | |
* | | better handle a missing gitlab-shell versionBrett Walker2018-05-301-2/+2
| | |
* | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-51/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace grape-route-helpers with our own grape-path-helpers Closes #45718 See merge request gitlab-org/gitlab-ce!19240
| * | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-51/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes: 1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21 2. Fixes some broken specs and code for Grape 1.0+ 3. Optimizes the generation of paths by bringing in @dblessing's HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793 Closes #45718
* | | Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+1
|/ / | | | | | | | | | | | | This endpoint lists projects shared with a group visible to the current user. The `filter` and `sort` params are supported like on the `children` endpoint.
* | Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-281-0/+1
|\ \ | |/ |/| | | | | | | | | Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page Closes #45190 See merge request gitlab-org/gitlab-ce!18991
| * Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+1
| | | | | | | | | | We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info.
* | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-252-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125
| * | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-242-2/+2
| |/ | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-disable-background-metrics-in-tests' into 'master'Robert Speicher2018-05-241-1/+1
|\ \ | | | | | | | | | | | | Disable the background Prometheus sampler in tests See merge request gitlab-org/gitlab-ce!19130
| * | Disable the background Prometheus sampler in testssh-disable-background-metrics-in-testsStan Hu2018-05-241-1/+1
| |/ | | | | | | | | This sampler can interfere with tests and cause transient build failures, such as https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/70241683.
* | Merge branch '46741-add-access-control-allow-headers-wds' into 'master'Mike Greiling2018-05-241-1/+4
|\ \ | |/ |/| | | | | | | | | Add `Access-Control-Allow-Headers` to Webpack Dev Server config Closes #46741 See merge request gitlab-org/gitlab-ce!19131
| * Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
| |
* | Merge branch ↵Douwe Maan2018-05-231-3/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754