summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-285-25/+37
|\
| * 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
| | |/ | |/|
* | | Correctly resolves/unresolves discussionsPhil Hughes2016-07-261-1/+1
* | | convert CS to JSPhil Hughes2016-07-261-1/+1
* | | Merge branch 'master' into diff-line-comment-vuejsPhil Hughes2016-07-263-2/+16
|\ \ \ | |/ /
| * | 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
* | Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-251-4/+8
* | Resolve all endpointPhil Hughes2016-07-241-0/+4
* | Posts to rails to update note eventuallyPhil Hughes2016-07-241-0/+1
* | Diff line comments resolvePhil Hughes2016-07-241-0/+1
|/
* 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
* | | Merge branch '15343-build-settiings' into 'master' Rémy Coutable2016-07-201-0/+4
|\ \ \
| * | | Create PipelinesSettingsController for showing settings pageKamil Trzcinski2016-07-201-1/+3
| * | | Update routesKamil Trzcinski2016-07-201-4/+1
| * | | Merge remote-tracking branch 'origin/master' into 15343-build-settiingsKamil Trzcinski2016-07-202-5/+21
| |\ \ \
| * | | | Move Pipelines settings under `gitlab.com/gitlab-org/gitlab-ce/pipelines/sett...Kamil Trzcinski2016-07-191-1/+5
| * | | | Remove builds settings from project settings; add builds settings route; add ...Annabel Dunstone2016-07-191-1/+2
* | | | | Merge branch 'rename-js-files' into 'master' Fatih Acet2016-07-201-4/+4
|\ \ \ \ \
| * | | | | Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-4/+4
* | | | | | Log cron_jobs configuration instead of raising exceptionGabriel Mazetto2016-07-201-1/+2
* | | | | | Fix the Sentry spam from CSP violations by disabling it.Connor Shea2016-07-191-12/+2
| |_|/ / / |/| | | |
* | | | | Fix help page paths to make sure shortcuts and the UI help page work.fix-help-pathsConnor Shea2016-07-191-5/+4
| |_|_|/ |/| | |
* | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-192-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve manual actions code and add model, service and feature testsKamil Trzcinski2016-07-181-0/+16
| * | | Add implementation of manual actionsKamil Trzcinski2016-07-181-0/+1
* | | | Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-1/+1
| |/ /
* | | Improve cron_jobs loading error messagesGabriel Mazetto2016-07-181-1/+8
View Lorry Controller Status