summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan2017-09-011-1/+4
|\
| * Ignore fuzzy translationsBob Van Landuyt2017-08-311-1/+4
* | Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern2017-09-011-0/+1
|\ \
| * | Instrument MergeRequest#fetch_ref36061-mr-ref-instrumentJarka Kadlecova2017-09-011-0/+1
* | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-312-5/+3
| |/ |/|
* | Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'Douwe Maan2017-08-311-12/+5
|\ \
| * | Default LDAP config verify_certificates to trueMichael Kozono2017-08-301-12/+5
| |/
* | Update Prometheus Client MMAP gem to version that fixes performance degradati...pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradationPawel Chojnacki2017-08-291-0/+3
|/
* Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-281-0/+3
* Define ldap methods at runtimeBob Van Landuyt2017-08-241-6/+0
* Update form to properly set the pathZeger-Jan van de Weg2017-08-221-3/+1
* Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-171-1/+5
* Setup LDAP settings properlyMichael Kozono2017-08-171-0/+4
* Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-161-0/+20
|\
| * Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-161-0/+20
* | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-161-2/+2
|\ \
| * | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-161-2/+2
| |/
* | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-161-0/+2
|\ \
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-0/+2
| |/
* | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-163-7/+7
|\ \
| * | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-153-7/+7
| |/
* | Make sure MySQL would not use CURRENT_TIMESTAMP36405-fix-mysql-timestamp-columnsLin Jen-Shin2017-08-151-0/+30
|/
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-2/+2
* 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
|\ \
View Lorry Controller Status