summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Setup JSDocWinnie Hellmann2018-12-051-0/+14
* Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-041-0/+8
|\
| * Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r...Grzegorz Bizon2018-12-042-0/+4
| |\
| * \ Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-294-5/+18
| |\ \
| * \ \ Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-287-23/+44
| |\ \ \
| * | | | Ensure that db encryption keys have proper bytesizeGrzegorz Bizon2018-11-221-0/+8
* | | | | Disable format determination based on path extensionDouwe Maan2018-12-031-0/+19
* | | | | Revert "Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/proj...Douwe Maan2018-12-031-1/+1
| |_|_|/ |/| | |
* | | | Add config to disable impersonationImre Farkas2018-11-292-0/+4
| |_|/ |/| |
* | | Merge branch 'security-email-change-notification' into 'master'Cindy Pallares2018-11-281-0/+3
* | | Merge branch 'security-fix-uri-xss-applications' into 'master'Cindy Pallares2018-11-281-0/+7
* | | Merge branch 'security-fix-pat-web-access' into 'master'Cindy Pallares2018-11-281-5/+5
* | | Merge branch 'security-182-update-workhorse' into 'master'Cindy Pallares2018-11-281-0/+3
| |/ |/|
* | Merge branch '53763-fix-encrypt-columns-data-loss' into 'master'Stan Hu2018-11-271-2/+22
|\ \
| * | Correctly handle data-loss scenarios when encrypting columnsNick Thomas2018-11-271-2/+22
* | | Merge branch 'issuable-suggestions' into 'master'Filipa Lacerda2018-11-271-1/+11
|\ \ \ | |/ / |/| |
| * | Suggests issues when typing titlePhil Hughes2018-11-271-1/+11
* | | Remove monkeypatch as now present in upstreamThong Kuah2018-11-271-15/+0
|/ /
* | Merge branch 'jprovazn-locale-fix' into 'master'Grzegorz Bizon2018-11-232-4/+6
|\ \
| * | Explicitly set locale fallbacksjprovazn-locale-fixJan Provaznik2018-11-212-4/+6
| |/
* | Clear BatchLoader context between Sidekiq jobsDouwe Maan2018-11-221-0/+1
* | Add version migration support to rails 4Jan Provaznik2018-11-221-0/+3
* | Eliminate duplicated wordsTakuya Noguchi2018-11-221-1/+1
|/
* Remove unneeded licenses for gitlab-org npm namsepaceMike Greiling2018-11-161-7/+0
* Use Nokogiri as the ActiveSupport XML backendsh-use-nokogiri-xml-backendStan Hu2018-11-161-0/+3
* Fix index for mysql adapterJan Provaznik2018-11-141-16/+34
* Switch to Rails 5 by defaultJan Provaznik2018-11-143-6/+6
* Extend clusters_controller for group type clustersThong Kuah2018-11-081-0/+2
* Fix syntax error in initializers/fill_shardsDmitriy Zaporozhets2018-11-071-4/+3
* Merge branch 'revert-45b61a9e' into 'master'Nick Thomas2018-11-071-2/+3
|\
| * Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'mas...Douwe Maan2018-11-071-2/+3
* | Merge branch '52767-more-chaos-for-gitlab' into 'master'Sean McGivern2018-11-071-0/+7
|\ \
| * | Add documentation, secure routes, etcAndrew Newdigate2018-11-011-4/+6
| * | Leak memory, spin cpu and kill the processAndrew Newdigate2018-11-011-0/+3
| * | Adding chaos to GitLab through chaos endpointsAndrew Newdigate2018-11-011-0/+2
* | | Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-31/+0
|\ \ \ | |_|/ |/| |
| * | Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-31/+0
* | | Merge branch 'dz-add-packages-to-yml' into 'master'Marin Jankovski2018-11-061-0/+4
|\ \ \
| * | | Add packages section to CE config filedz-add-packages-to-ymlDmitriy Zaporozhets2018-10-051-0/+4
* | | | Squashed commit of the following:Shinya Maeda2018-11-061-0/+1
* | | | Allow concurrency when using PumaAndrew Newdigate2018-11-052-1/+3
* | | | Start tracking pool repositoriesNick Thomas2018-11-051-0/+1
* | | | Start tracking shards in the databaseNick Thomas2018-11-051-0/+3
* | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil TrzciƄski2018-11-022-14/+18
|\ \ \ \
| * | | | Resolve controller sharing concernThong Kuah2018-11-011-15/+13
| * | | | Abstract out project out of ClustersControllerThong Kuah2018-11-011-14/+16
| * | | | Convert clusters to use a top-level controllerThong Kuah2018-11-012-14/+18
* | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-11-025-4/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
| |\ \ \ \ \
| | * | | | | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| | | |_|/ / | | |/| | |