summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-101-33/+70
|\
| * Ignore Rails/Exit cop in initializerSean McGivern2016-08-041-1/+1
| * Clarify intentions of secret token initializerSean McGivern2016-08-031-35/+55
| * Give priority to environment variablesSean McGivern2016-08-031-4/+20
| * Store all secret keys in secrets.ymlSean McGivern2016-08-031-24/+16
| * Store OTP secret key in secrets.ymlSean McGivern2016-08-031-36/+45
* | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-095-46/+62
|\ \
| * | Added Redis Sentinel support documentationGabriel Mazetto2016-08-041-1/+1
| * | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| * | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-041-16/+16
| * | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-041-1/+1
| * | Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-08-041-8/+6
| * | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-044-38/+52
* | | Update to send changed password notification emailsTom Bell2016-08-051-0/+3
|/ /
* | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-3/+3
|\ \
| * | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-3/+3
* | | Instrument Gitlab::Highlightinstrument-gitlab-highlightYorick Peterse2016-08-031-0/+3
| |/ |/|
* | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-021-7/+11
|\ \
| * | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-021-7/+11
| |/
* | Instrument the Repository classinstrument-repository-classYorick Peterse2016-08-021-0/+1
|/
* Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reloadAhmad Sherif2016-08-011-0/+2
* Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-011-1/+1
|\
| * Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-291-1/+1
| * Add an URL field to EnvironmentsZ.J. van de Weg2016-07-291-1/+1
* | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-311-0/+2
|/
* Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-filesAhmad Sherif2016-07-271-1/+1
* Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master' Rémy Coutable2016-07-271-12/+10
|\
| * Remove useless new route14584-remove-routes-that-we-do-not-use-anymoreRémy Coutable2016-07-271-1/+1
| * Add route for Import::GithubController#newRémy Coutable2016-07-261-1/+1
| * Clean up unused routesJosef Strzibny2016-07-261-14/+12
* | Merge branch '20124-disable-repository-validation-during-precompile-step' int...Stan Hu2016-07-271-1/+1
|\ \
| * | Add ENV variable to skip repository storages validations20124-disable-repository-validation-during-precompile-stepAlejandro Rodríguez2016-07-251-1/+1
* | | Whitelist 'Simplified BSD' licenseDouwe Maan2016-07-261-12/+19
* | | Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-263-0/+7
| |/ |/|
* | Enable SIDEKIQ_REQUEST_STORE by defaultadd-sidekiq-request-storeStan Hu2016-07-251-1/+1
* | Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_S...Stan Hu2016-07-251-0/+1
|/
* Instrument Nokogiri parsing methodsYorick Peterse2016-07-251-0/+7
* Ignore invalid trusted proxies in X-Forwarded-For headerreject-invalid-trusted-proxiesStan Hu2016-07-231-2/+8
* Skip repository storage path valitaions on test environmentAlejandro Rodríguez2016-07-211-6/+10
* Use Pathname to make the repository storage path validations more robustAlejandro Rodríguez2016-07-211-5/+6
* Avoid data-integrity issue when repository_downloads_path is incorrectlyDouglas Barbosa Alexandre2016-07-211-1/+15
* Update default path for repository_downloads_path in gitlab.yml.exampleDouglas Barbosa Alexandre2016-07-211-2/+2
* Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-211-2/+6
|\
| * Don't allow `.ogg` as a valid video extension4142-show-inline-videoRémy Coutable2016-07-211-1/+1
| * Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable2016-07-191-4/+2
| * First support of videos in issues, MRs and notesEric Hayes2016-07-191-2/+8
* | Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-201-109/+0
* | Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher2016-07-201-2/+12
* | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-201-1/+1
|\ \
| * | Refactor and rename `restricted_signup_domains` to `domain_whitelist` to bett...Patricio Cano2016-07-181-1/+1
View Lorry Controller Status