summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-051-0/+1
|
* Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-3/+7
|\ | | | | | | | | Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
| * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-3/+7
| |
* | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-022-40/+0
| | | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | Merge branch 'dz-fix-mysql-schema' into 'master'Dmitriy Zaporozhets2018-10-011-0/+4
|\ \ | | | | | | | | | | | | Fix undefined format_options method in SchemaDumper for MySQL db See merge request gitlab-org/gitlab-ce!21907
| * | Fix undefined format_options method in SchemaDumper for MySQL dbdz-fix-mysql-schemaDmitriy Zaporozhets2018-09-261-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Guard against a login attempt with invalid CSRF tokensh-guard-against-ldap-login-csrf-failStan Hu2018-09-261-0/+5
| |/ |/| | | | | | | | | | | | | If a user logs in with a bad CSRF token, the Warden before_logout hook will be called with no valid user. This would lead to odd Error 500 messages with a backtrace. Addresses part of #50857
* | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+0
|/ | | | We remove this feature as it never worked properly
* 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-171-1/+1
| |
* | 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.
* | | | Enable omniauth by defaultNick Thomas2018-09-131-1/+1
|/ / /
* | | Fix rails 5 deprecation warningsJan Provaznik2018-09-112-9/+16
|/ / | | | | | | Fixes rails 5 deprecation warnings in `config/` files
* | Merge branch 'fix-closing-issues' into 'master'Sean McGivern2018-09-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix closing issue default pattern Closes #51085 See merge request gitlab-org/gitlab-ce!21531
| * | Fix closing issue default patternSamuele Kaplun2018-09-061-1/+1
| |/ | | | | | | | | | | * (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.
* 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
| |
* | 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
* | 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
* Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-211-1/+1
| | | | | | | This is needed to support query parameters in `Fog::Storage::Google`. See https://github.com/fog/fog-google/pull/409. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957
* Merge branch 'rails5-verbose-query-logs' into 'master'Robert Speicher2018-08-161-1/+3
|\ | | | | | | | | Rails5: Enable verbose query logs See merge request gitlab-org/gitlab-ce!21231
| * Rails5: Enable verbose query logsJasper Maes2018-08-161-1/+3
| |
* | Frontend: Proper gettext extraction with gettext-extractor🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-161-0/+15
|/
* Merge branch 'enable-verbose-query-logs' into 'master'Robert Speicher2018-08-071-0/+54
|\ | | | | | | | | Enable verbose query logging See merge request gitlab-org/gitlab-ce!20976
| * Enable verbose query loggingenable-verbose-query-logsKamil Trzciński2018-08-071-0/+54
| | | | | | | | | | This backports the https://github.com/rails/rails/pull/26815 and enables that for non-Rails5 and non-production environments.
* | Simplify the check of reduntant user logout eventsGrzegorz Bizon2018-08-031-7/+7
| |
* | Do not skip recording session destruction eventsGrzegorz Bizon2018-08-031-4/+4
| |
* | Improve blocked user tracking code readabilityGrzegorz Bizon2018-08-031-1/+6
| |
* | Skip redunant before_logout warden eventsGrzegorz Bizon2018-08-021-5/+14
| |
* | Improve authentication events-related code readabilityGrzegorz Bizon2018-08-011-1/+1
| |
* | Do not implicitly authenticate user during session creationGrzegorz Bizon2018-08-011-1/+1
| |
* | Simplify blocked user tracking during authenticationGrzegorz Bizon2018-08-011-10/+8
| |
* | Improve blocked user tracking and fire some events only onceGrzegorz Bizon2018-08-011-1/+5
|/
* Merge branch 'feature/gb/login-activity-metrics' into 'master'Sean McGivern2018-07-311-5/+25
|\ | | | | | | | | | | | | Add user authentication activity metrics Closes #47789 See merge request gitlab-org/gitlab-ce!20668
| * Improve authentication activity code readabilityGrzegorz Bizon2018-07-311-4/+6
| |
| * Fix rubocop offense in warden initializersGrzegorz Bizon2018-07-271-2/+2
| |
| * Catch custom warden events too to increment metricsGrzegorz Bizon2018-07-271-9/+15
| |
| * Make authentication metrics events explicit is specsGrzegorz Bizon2018-07-261-1/+1
| |
| * Track blocked users and two factor authenticationsGrzegorz Bizon2018-07-231-6/+5
| |
| * Refactor blocked user tracker classGrzegorz Bizon2018-07-201-11/+12
| |
View Lorry Controller Status