summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+0
| | | | We remove this feature as it never worked properly
* Fix leading slash in redirects and add copSanad Liaquat2018-09-212-2/+2
|
* Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-211-1/+1
|
* Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-0/+1
|\ | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * merge master and resolve conflictsMartin Wortschack2018-09-115-20/+63
| |\
| * \ merge master and resolve conflictsMartin Wortschack2018-09-0610-33/+124
| |\ \
| * | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-051-1/+1
| | | |
| * | | split application settings into multiple sub pagesMartin Wortschack2018-09-041-0/+1
| | | |
* | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
| * | | | Lazy load xterm css colorsFilipa Lacerda2018-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* | | | | Include post migrations when loading the schemaYorick Peterse2018-09-191-11/+1
|\ \ \ \ \ | |/ / / / |/| | | | See merge request gitlab-org/gitlab-ce!21689
| * | | | Ensure the schema is loaded with post_migrations includedDJ Mountney2018-09-111-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* | | | | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-172-3/+3
| | | | |
* | | | | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-141-20/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * | | | | Properly implement prepending for ConcernLin Jen-Shin2018-09-111-20/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'remove-sidekiq' into 'master'Robert Speicher2018-09-141-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove peek-sidekiq Closes #51407 See merge request gitlab-org/gitlab-ce!21693
| * | | | | Remove peek-sidekiqJan Provaznik2018-09-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for removing this gem is that it's not being maintained anymore. It uses `alias_method_chain` which is deprecated in rails 5 (and removed in 5.1), the issue is pending upstream (including a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while. Peek-sidekiq is used in performance bar for displaying sidekiq statistics.
* | | | | | Fix karma junit reports on CILukas Eipert2018-09-141-1/+1
| | | | | |
* | | | | | Merge branch '49990-enable-omniauth-by-default' into 'master'Douwe Maan2018-09-132-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable omniauth by default Closes #49990 See merge request gitlab-org/gitlab-ce!21700
| * | | | | | Enable omniauth by defaultNick Thomas2018-09-132-3/+3
| |/ / / / /
* | | | | | Merge branch 'rails5-route-warnings' into 'master'Grzegorz Bizon2018-09-132-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Fix route deprecation warnings in rails 5 See merge request gitlab-org/gitlab-ce!21684
| * | | | | Fix route deprecation warnings in rails 5Jan Provaznik2018-09-122-2/+2
| | | | | |
* | | | | | Merge branch 'sh-allow-key-id-in-params' into 'master'Robert Speicher2018-09-111-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter any parameters ending with "key" in logs See merge request gitlab-org/gitlab-ce!21688
| * | | | | | Filter any parameters ending with "key" in logsStan Hu2018-09-111-3/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails does a partial match for strings in the filter_parameters configuration, so the parameter "key" causes "key_id" to be filtered even though it's a useful parameter for debugging internal API issues. We now revise this filter to make any parameter ending with "key" is filtered. Relates to https://gitlab.com/gitlab-com/gl-infra/production/issues/463
* | | | | | Generate JUnit report for Karma testsWinnie Hellmann2018-09-111-3/+12
|/ / / / /
* | | | | Fix rails 5 deprecation warningsJan Provaznik2018-09-114-13/+21
|/ / / / | | | | | | | | | | | | Fixes rails 5 deprecation warnings in `config/` files
* | | | Delete a container registry asynchronouslyStan Hu2018-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a container registry has many tags, it's easy for the DELETE call to take more than 60 seconds and fail. This can also leave the registry in a bad state with null bytes since some of the images have been deleted with tags still pointing to them. In addition, we have to prevent users from accidentally initiating the delete multiple times or this could leave the registry with orphaned tags. This commit also adds a flash message to notify the user the registry is scheduled for deletion. Closes #49926, #51063
* | | | Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-071-18/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import common metrics into database. Closes gitlab-ee#6948 See merge request gitlab-org/gitlab-ce!21459
| * \ \ \ Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-069-34/+115
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Fix common_metrics.ymlKamil Trzciński2018-09-061-0/+1
| | | | | |
| * | | | | Split canary metrics into separate onesKamil Trzciński2018-09-061-1/+17
| | | | | |
| * | | | | Import common metrics into database.Kamil Trzciński2018-09-041-17/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR backports PrometheusMetric model to CE and adds: common, identifier to figure out what kind of metric is used.
* | | | | | Resolve "Improve handling of projects shared with a group"Dennis Tang2018-09-071-0/+3
| |/ / / / |/| | | |
* | | | | Automatically disable Auto DevOps for project upon first pipeline failureMayra Cabrera2018-09-061-0/+1
| | | | |
* | | | | Merge branch 'fix-closing-issues' into 'master'Sean McGivern2018-09-062-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix closing issue default pattern Closes #51085 See merge request gitlab-org/gitlab-ce!21531
| * | | | Fix closing issue default patternSamuele Kaplun2018-09-062-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | * (Suf)fix #51085 :-) Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
* | | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-062-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attachments not displaying inline with Google Cloud Storage Closes #49957 See merge request gitlab-org/gitlab-ce!21265
| * | | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-052-1/+30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957
* | | | Add User-Agent to production_json.logStan Hu2018-09-051-1/+2
|/ / / | | | | | | | | | | | | This will help production gain more visibility which browsers may be having issues.
* | | Add license info of unknown libraries to license_finder configuration ↵Balasankar "Balu" C2018-09-051-10/+18
| | | | | | | | | | | | instead of direct approval
* | | Make MySQL patch for binary indexes compatible with composite indexesOlivier Gonzalez2018-09-041-2/+4
| | |
* | | Merge branch 'rails5-include-opclasses-in-schema-dump' into 'master'Yorick Peterse2018-09-041-19/+31
|\ \ \ | | | | | | | | | | | | | | | | Rails 5: include opclasses in rails 5 schema dump See merge request gitlab-org/gitlab-ce!21416
| * | | Rails 5: include opclasses in rails 5 schema dumpJasper Maes2018-08-291-19/+31
| | |/ | |/|
* | | Rails 5: support schema t.index for mysqlJasper Maes2018-09-031-0/+28
| |/ |/|
* | Move badge settings to general settingsWinnie Hellmann2018-09-032-2/+0
| |
* | Merge branch 'sh-bump-unauth-expiration' into 'master'Douwe Maan2018-09-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump unauthenticated session time from 1 hour to 2 hours Closes #50393 See merge request gitlab-org/gitlab-ce!21453
| * | Bump unauthenticated session time from 1 hour to 2 hoursStan Hu2018-08-311-1/+1
| |/ | | | | | | | | | | | | | | | | | | Users who have their system clocks configured inconsistently due to Daylight Savings may see a GitLab session cookie that immediately expires, resulting in a 422 error. To avoid these errors, we can bump the unauthenticated session time from 1 hour to 2 hours so they have time to login and get the default 7-day session. Closes #50393
* | Merge branch 'sh-disable-sidekiq-session' into 'master'Sean McGivern2018-09-031-0/+6
|\ \ | | | | | | | | | | | | Disable the Sidekiq Admin Rack session See merge request gitlab-org/gitlab-ce!21441
| * | Disable the Sidekiq Admin Rack sessionStan Hu2018-08-311-0/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | GitLab already has its own session store, so this extra Sidekiq session is unnecessary. In addition, the GitLab session store properly sets the Secure flag, unlike the default Rack session. CSRF protection in the Sidekiq /admin page continues to work with the existing GitLab session. See https://github.com/mperham/sidekiq/pull/3183 for more details. Part of #49120
* | Merge branch 'winh-ignore-npm-devdependencies' into 'master'Phil Hughes2018-09-031-0/+7
|\ \ | |/ |/| | | | | Exclude frontend development dependencies from license restrictions See merge request gitlab-org/gitlab-ce!21430
View Lorry Controller Status