summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/ha-mode-import-issue' into 'master'Rémy Coutable2016-08-041-3/+3
* Merge branch 'fix-invalid-x-forwarded-for-ip' into 'master'Stan Hu2016-08-011-0/+2
* Merge branch '20124-disable-repository-validation-during-precompile-step' int...Stan Hu2016-07-271-1/+1
* Merge branch 'reject-invalid-trusted-proxies'Rémy Coutable2016-07-251-2/+8
* Merge branch '19572-storage-path-validations-fail-incorrectly-for-some-patter...Stan Hu2016-07-221-8/+13
* Merge branch 'fix-data-integrity-issue-with-repository-downloads-path' into '...Douwe Maan2016-07-212-3/+17
* Merge branch 'rs-revert-csp' into 'master' Robert Speicher2016-07-211-99/+0
* Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-211-1/+1
* Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-211-2/+6
* Merge branch '15343-build-settiings' into 'master' Rémy Coutable2016-07-201-0/+4
* Merge branch 'regression/cron_jobs_validation' into 'master' Rémy Coutable2016-07-201-1/+2
* Merge branch 'remove-csp-sentry-reporting' into 'master' Stan Hu2016-07-201-12/+2
* Merge branch 'fix-help-paths' into 'master' Dmitriy Zaporozhets2016-07-201-5/+4
* Merge branch 'rename-js-files' into 'master' Fatih Acet2016-07-201-4/+4
* Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-192-0/+17
* Merge branch 'csp-basics' into 'master' Robert Speicher2016-07-191-0/+109
* Merge branch 'bug/sidekiq-cron-better-error' into 'master' Gabriel Mazetto2016-07-191-1/+8
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-191-1/+1
* 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
|/ / /
* | | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-1/+1
|\ \ \
| * | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-051-1/+1
| | |/ | |/|
* | | Instrument Rinku usage18593-autofilter-rinku-instrumentationPaco Guzman2016-07-041-0/+2
|/ /
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-012-6/+0
* | Merge branch 'upgrade-sprockets-rails' into 'master' Robert Speicher2016-07-011-0/+3
|\ \
| * | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-0/+3
* | | Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slowPaco Guzman2016-07-011-0/+3
|/ /
* | Import from Github using Personal Access Tokens.Eric K Idema2016-06-302-1/+3
* | Merge branch 'rack-request-trusted-proxies' into 'master' Douwe Maan2016-06-301-0/+13
|\ \
| * | Make Rack::Request use our trusted proxies when filtering IP addressesrack-request-trusted-proxiesDJ Mountney2016-06-291-0/+13
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+6
|\ \ \
| * | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-0/+6
* | | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shardsAlejandro Rodríguez2016-06-291-19/+1
* | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-294-7/+46
| |/ / |/| |
* | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-292-2/+2
* | | Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-291-1/+1
|/ /
* | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+1
|/
* Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-241-0/+2
|\
| * Add precompilation for relevant assets.Connor Shea2016-06-231-0/+2