summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Minor policy refinements.csp-basicsConnor Shea2016-07-181-8/+12
* | | Document the CSP file.Connor Shea2016-07-181-11/+38
* | | Only enable CSP policies when relevant features are enabled.Connor Shea2016-07-181-1/+27
* | | Remove background_jobs-specific headers.Connor Shea2016-07-181-5/+0
* | | Only report to Sentry when it's enabled.Connor Shea2016-07-181-2/+6
* | | Add Sidekiq-specific headers.Connor Shea2016-07-181-2/+10
* | | Add the CSP reporting URI of Sentry.Connor Shea2016-07-181-1/+8
* | | Update image policy to allow external images over HTTPS.Connor Shea2016-07-181-1/+1
* | | Remove unsafe eval directive from scripts.Connor Shea2016-07-181-1/+1
* | | Fix that which hath been broken. Except the sidekiq admin iframe.Connor Shea2016-07-181-0/+38
|/ /
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-151-0/+1
|\ \ | |/ |/|
| * Load Javascript U2F library selectively.Timothy Andrew2016-07-141-0/+1
* | Merge branch 'remove-hound-config' into 'master' Stan Hu2016-07-121-87/+0
|\ \
| * | Remove teatro configremove-hound-configRobert Schilling2016-07-051-87/+0
* | | Merge branch 'update-health-check-gem' into 'master' Rémy Coutable2016-07-121-13/+0
|\ \ \
| * | | Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-111-13/+0
| | |/ | |/|
* | | Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-111-2/+2
* | | Make "Get started with Builds" Help Page link work properlyconnorshea2016-07-111-0/+1
* | | Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-0/+1
|\ \ \ | |/ /
| * | Merge branch 'cs-cropper' into 'master' Fatih Acet2016-07-081-0/+1
| |\ \
| | * | Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-291-0/+1
* | | | Support renames in diff_for_path actionsSean McGivern2016-07-111-4/+4
* | | | Collapse large diffs by defaultSean McGivern2016-07-081-4/+11
|/ / /