summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'enable-snippets-by-default' into 'master' Douwe Maan2017-03-102-2/+2
|\
| * Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-102-2/+2
* | Document gitaly.socket_path settingJacob Vosmaer2017-03-101-0/+10
|/
* Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' Filipa Lacerda2017-03-091-2/+1
|\
| * Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modulesEric Eastwood2017-03-081-2/+1
* | Merge branch 'storage-validation-improvement' into 'master' Sean McGivern2017-03-091-6/+10
|\ \
| * | Improve storage validation after configuration structure updatestorage-validation-improvementAlejandro Rodríguez2017-03-081-6/+10
| |/
* | Merge branch 'move-u2f-bundle' into 'master' Alfredo Sumaran2017-03-092-1/+1
|\ \ | |/ |/|
| * move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-072-1/+1
* | Clear AR connections before starting SidekiqYorick Peterse2017-03-081-0/+6
* | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' Robert Speicher2017-03-071-9/+28
|\ \
| * | Swallow collection errors in RspecProfilingNick Thomas2017-03-071-9/+28
* | | Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-071-0/+1
|\ \ \
| * \ \ Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-079-13/+22
| |\ \ \ | | | |/ | | |/|
| * | | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-061-0/+1
* | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-0/+1
* | | | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-073-11/+30
|\ \ \ \
| * | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-033-11/+30
* | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' James Lopez2017-03-071-1/+1
|\ \ \ \ \
| * | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limitRegis Freyd2017-03-071-1/+1
* | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-075-4/+53
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add specs for Doorkeeper resource_owner_authenticatorMarkus Koller2017-03-071-2/+2
| * | | | | Implement OpenID Connect identity providerMarkus Koller2017-03-075-2/+51
| |/ / / /
* | | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | applies relevant changes to the code and code structureTiago Botelho2017-02-281-1/+1
| * | | | add admin panel for personal access tokensSimon Vocella2017-02-281-0/+5
* | | | | Improve pipeline triggers UIKamil Trzciński2017-03-071-1/+5
* | | | | Moved call of SystemHooksService from UpdateMergeRequestsWorker to GitPushSer...gpongelli2017-03-071-0/+1
| |_|_|/ |/| | |
* | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-074-5/+1
|\ \ \ \
| * | | | Use native unicode emojisEric Eastwood2017-03-064-5/+1
* | | | | Merge branch 'backport-ee-change-webpack-empty-states' into 'master' Jacob Schatz2017-03-071-0/+1
|\ \ \ \ \
| * | | | | Backport change introduced in EE - alias for empty states SVGsbackport-ee-change-webpack-empty-statesFilipa Lacerda2017-03-031-0/+1
| | |_|/ / | |/| | |
* | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-061-0/+1
| |/ / / |/| | |
* | | | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' Rémy Coutable2017-03-061-1/+1
|\ \ \ \
| * | | | Fix typo in Gitlab application config filemedied2017-03-041-1/+1
| |/ / /
* | | | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-062-0/+3
|\ \ \ \
| * | | | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-282-0/+3
| | |/ / | |/| |
* | | | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-061-1/+0
|\ \ \ \
| * | | | remove manually vendored raphael library in favor of node moduleMike Greiling2017-03-051-1/+0
* | | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' Kamil Trzciński2017-03-062-6/+6
|\ \ \ \ \
| * | | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-032-5/+5
| * | | | | Update default configuration of stuck_ci_builds_worker cron intervalTomasz Maczukin2017-03-012-2/+2
| | |/ / / | |/| | |
* | | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-0/+5
* | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-062-8/+2
* | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-063-2/+12
| |_|_|/ |/| | |
* | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-1/+1
|\ \ \ \
| * | | | Remove remnants of git annexPawel Chojnacki2017-03-031-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-063-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Execute metrics initializer earlieretag-notes-pollingAdam Niedzielski2017-03-011-0/+0
| * | | Add middleware for ETag caching with RedisAdam Niedzielski2017-03-011-0/+4
View Lorry Controller Status