summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2914-64/+212
|\
| * Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-291-3/+2
| |\
| | * Fix specsblackst0ne2018-10-261-1/+1
| | * Update other linksblackst0ne2018-10-261-1/+1
| | * Make new merge request URL more friendly when pushing codeblackst0ne2018-10-231-2/+1
| * | Backport CE route changes for Ops Dashboard in EE5781-operations-homepage-mvc-routesPeter Leitzen2018-10-271-0/+1
| * | Extract EE only oauth routes and add testsLin Jen-Shin2018-10-261-0/+2
| * | Put EE routes in EE files under EE directoriesLin Jen-Shin2018-10-263-7/+6
| * | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-259-54/+200
| |\ \
| | * | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-259-54/+200
| * | | Backport SSH host key detection code to CENick Thomas2018-10-251-0/+1
| |/ /
* | | Merge branch 'sh-fix-hipchat-ssrf' into 'master'Jan Provaznik2018-10-291-0/+14
|\ \ \ | |/ / |/| |
| * | Prevent SSRF attacks in HipChat integrationStan Hu2018-10-021-0/+14
* | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-3/+0
| |/ |/|
* | Allow to configure cache path for webpackKamil Trzciński2018-10-191-1/+1
* | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-151-3/+0
|\ \
| * | Remove Koding integration and documentationStan Hu2018-10-121-3/+0
* | | Fix rubocop complaining about unicorn.rbBrett Walker2018-10-122-4/+4
|/ /
* | Remove Git circuit breakerZeger-Jan van de Weg2018-10-102-4/+1
* | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-053-0/+3
|\ \
| * | Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-052-0/+2
| * | Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-051-0/+1
* | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-055-6/+14
|\ \ \ | |/ /
| * | Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-3/+7
| |\ \
| | * | Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-3/+7
| * | | Merge branch 'fix-todo-cops' into 'master'Rémy Coutable2018-10-041-1/+1
| |\ \ \
| | * | | Fix SpaceBeforeFirstArg copSemyon Pupkov2018-09-201-1/+1
| * | | | Merge branch '41922-simplify-runner-registration-token-resetting' into 'master'Kamil Trzciński2018-10-043-2/+5
| |\ \ \ \
| | * | | | Simplify runner registration token resettingTomasz Maczukin2018-10-043-2/+5
| * | | | | Resolve "Add new "Overview" tab on user profile page"Martin Wortschack2018-10-041-0/+1
| |/ / / /
* | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-044-41/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '43511-upgrade-to-babel-7' into 'master'Fatih Acet2018-10-032-1/+22
| |\ \ \ \
| | * | | | Make DefinePlugin definitions more specificMike Greiling2018-10-021-3/+2
| | * | | | Remove babel-plugin-transform-define dependencyMike Greiling2018-10-021-4/+7
| | * | | | Merge remote-tracking branch 'origin/psimyn-speedup-karma' into 43511-upgrade...Mike Greiling2018-10-021-1/+6
| | |\ \ \ \
| | | * | | | Speed up karma runs for developmentSimon Knox2018-10-021-1/+6
| | | | |_|/ | | | |/| |
| | * | | | Add license approval for caniuse-lite and node-releasesMike Greiling2018-10-021-0/+14
| | |/ / /
| * | | | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-022-40/+0
| |/ / /
* | | | Add unschedule endpont to job controllerShinya Maeda2018-10-021-0/+1
|/ / /
* | | Merge branch 'dz-fix-mysql-schema' into 'master'Dmitriy Zaporozhets2018-10-011-0/+4
|\ \ \
| * | | Fix undefined format_options method in SchemaDumper for MySQL dbdz-fix-mysql-schemaDmitriy Zaporozhets2018-09-261-0/+4
| |/ /
* | | Guard against a login attempt with invalid CSRF tokensh-guard-against-ldap-login-csrf-failStan Hu2018-09-261-0/+5
| |/ |/|
* | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+0
* | Fix leading slash in redirects and add copSanad Liaquat2018-09-212-2/+2
* | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-211-1/+1
|/
* Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-0/+1
|\
| * merge master and resolve conflictsMartin Wortschack2018-09-115-20/+63
| |\
| * \ merge master and resolve conflictsMartin Wortschack2018-09-0610-33/+124
| |\ \
| * | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-051-1/+1
| * | | split application settings into multiple sub pagesMartin Wortschack2018-09-041-0/+1