summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-251-0/+3
|\
| * Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-251-0/+3
* | Disables Rack Attack by defaultTiago Botelho2018-07-251-1/+1
|/
* Merge branch 'dz-refactor-object-store-settings' into 'master'Rémy Coutable2018-07-241-23/+4
|\
| * Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settingsDmitriy Zaporozhets2018-07-241-6/+5
| * Create class responsible for default object store settingsDmitriy Zaporozhets2018-07-231-24/+6
* | Remove instrumentation Rouge::Plugins::{Redcarpet,CommonMark}Stan Hu2018-07-231-2/+0
|/
* Merge branch 'sh-remove-banzai-instrumentation' into 'master'Yorick Peterse2018-07-231-14/+0
|\
| * Remove method instrumentation for Banzai filters and reference parserssh-remove-banzai-instrumentationStan Hu2018-07-221-14/+0
* | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-232-6/+1
|\ \ | |/ |/|
| * Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-202-6/+1
* | Replace label-light with label-bold. Because it's bold, not lightAnnabel Dunstone Gray2018-07-191-1/+1
|/
* Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-191-4/+0
|\
| * Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-181-4/+0
* | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-181-0/+1
|/
* Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-174-8/+12
|\
| * Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-2/+7
| * Register all action mailer interceptors in a single placeGrzegorz Bizon2018-07-164-7/+7
| * Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-163-5/+4
* | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ | |/ |/|
| * Update issue closing patternGeorge Tsiolis2018-07-111-1/+1
* | Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_changeJasper Maes2018-07-091-0/+5
|/
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-2/+2
* Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-062-2/+2
|\
| * If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-022-2/+2
* | Delete monkey patchShinya Maeda2018-07-041-69/+0
* | Merge branch 'prune-web-hook-logs' into 'master'Douwe Maan2018-07-031-0/+4
|\ \
| * | Prune web hook logs older than 90 daysYorick Peterse2018-07-021-0/+4
| |/
* | Remove CarrierWave initializerStan Hu2018-06-291-31/+0
|/
* Enabling Doorkeeper reuse_access_token optionFrancisco Javier López2018-06-291-1/+1
* Fix OAuth application authorization screen to appear with every accessFrancisco Javier López2018-06-291-0/+50
* Merge branch 'feature/oidc-subject-claim' into 'master'Douwe Maan2018-06-281-2/+7
|\
| * Don't hash user ID in OIDC subject claimMarkus Koller2018-06-281-2/+7
* | Add RepositoryCheck::DispatchWorker to start worker per shardToon Claes2018-06-271-1/+1
|/
* Migrate storage nesting check to GitalyJacob Vosmaer (GitLab)2018-06-272-28/+1
* Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-251-1/+3
|\
| * Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
* | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-1/+1
|/
* More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-0/+2
* [Rails5] Fix optimistic lock valueblackst0ne2018-06-151-52/+59
* Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-141-0/+10
|\
| * Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-141-0/+10
* | Add missing `:comment` attributeJan Provaznik2018-06-101-1/+6
* | Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-reque...Douwe Maan2018-06-081-1/+5
|\ \
| * | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/58765974-geo-unauthenticated-rate-limits-should-not-block-geo-requestsValery Sizov2018-05-291-1/+5
* | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-0/+5
|\ \ \
| * | | force minimagick to use graphicsmagickAlexis Reigel2018-06-051-0/+3
| * | | register ico mime typeAlexis Reigel2018-06-051-0/+2
* | | | Merge branch '44790-disabled-emails-logging' into 'master'Sean McGivern2018-06-071-1/+4
|\ \ \ \
| * | | | 44790: Disable the action mailer base logging when emails are disabledMarc Shaw2018-06-031-1/+4