summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-2816-44/+204
|\
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+4
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-0/+4
| * | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-072-0/+10
| |/
| * Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+0
| * Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-042-0/+28
| * Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
| * Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-5/+8
| |\
| | * Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-5/+8
| * | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-1/+4
| * | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-3/+3
| |\ \
| | * | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-3/+3
| * | | Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher2017-07-271-6/+6
| |\ \ \
| | * | | Remove GitLab custom fealure app for deviseValery Sizov2017-07-271-6/+6
| * | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-271-0/+21
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | use Module#prepend instead of alias_method_chainAlexis Reigel2017-07-271-16/+12
| | * | | mysql hack: set length for binary indexesAlexis Reigel2017-07-271-0/+25
| | | |/ | | |/|
| * | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-271-1/+1
| |\ \ \
| | * | | Ensure test files are deleted after testsPawel Chojnacki2017-07-251-1/+1
| | | |/ | | |/|
| * | | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-271-4/+0
| | |/ | |/|
| * | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-271-1/+1
| |\ \
| | * | Add `rescue false`.blackst0ne2017-07-261-1/+1
| | * | Refactor CSRF protectionblackst0ne2017-07-261-1/+1
| * | | Add warning about certificate verification on loadMichael Kozono2017-07-261-1/+10
| * | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-1/+5
| * | | Add LDAP config optionsMichael Kozono2017-07-261-0/+5
| |/ /
| * | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-251-0/+3
| |\ \
| | * | Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfmTiago Botelho2017-07-251-0/+3
| | |/
| * | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-251-0/+35
| |/
| * Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-timeStan Hu2017-07-201-1/+1
| * Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-191-0/+12
| * Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-4/+0
| |\
| | * Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-4/+0
| * | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+21
| |/
| * Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-1/+0
| |\
| | * Remove .coffee ext files for i18nTakuya Noguchi2017-07-081-1/+0
| * | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-1/+1
| |\ \
| | * | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_namesPawel Chojnacki2017-07-131-1/+1
| * | | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
| * | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-141-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-131-1/+1
| * | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-112-4/+5
| |\ \ \
| | * | | Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-052-7/+2
| | * | | Add spaces between test phasesPawel Chojnacki2017-07-051-1/+1
| | * | | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+0
| | * | | Remove the need to use health check tokenPawel Chojnacki2017-07-051-0/+7
| * | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-114-12/+17
| * | | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-108-19/+33
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-101-0/+2
| * | | | Update sidekiq redis error rescue to include addrnotavailcatch-redis-address-errorDJ Mountney2017-06-271-1/+1