summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Hotfix for sidekiq-cron being loaded from Settingslogic with defaultsGabriel Mazetto2015-12-222-2/+6
* Merge branch 'feature/sidekiq-cron-config' into 'master' Dmitriy Zaporozhets2015-12-224-15/+20
|\
| * Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-configGabriel Mazetto2015-12-144-15/+20
* | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+1
|\ \
| * | Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+1
* | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-2/+2
|\ \ \
| * | | Allow account unlock via emailDrew Blessing2015-12-141-2/+2
| |/ /
* | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-213-0/+27
|\ \ \
| * | | add CAS authentication supporttduehr2015-12-143-0/+27
| |/ /
* | | Backport JIRA serviceDrew Blessing2015-12-181-1/+1
* | | Fixed Rubocop offensesGabriel Mazetto2015-12-152-6/+6
|/ /
* | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-45/+21
|\ \
| * \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-34/+21
| |\ \
| | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-34/+21
| * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-141-11/+0
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-11/+0
* | | Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+1
* | | Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-111-2/+0
|/ /
* | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-0/+8
|/
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-104-5/+6
|\
| * Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-092-2/+1
| * Merge branch 'master' into merge-if-greenDouwe Maan2015-12-092-2/+3
| |\
| | * Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-091-1/+2
| | |\
| | | * Move Builds tab to the endDouwe Maan2015-12-081-1/+1
| | | * Merge branch 'master' into mr-buildsDouwe Maan2015-12-082-1/+2
| | | |\
| | | * | Add Builds tab to MR detail pageDouwe Maan2015-12-081-0/+1
| | * | | Merge branch 'issue-closing-docs' into 'master' Robert Speicher2015-12-081-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' into issue-closing-docsissue-closing-docsDouwe Maan2015-12-083-0/+17
| | | |\ \ | | | | |/
| | | * | Update documentation about automatic issue closingDouwe Maan2015-12-071-1/+1
| * | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-082-1/+2
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-083-1/+18
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0718-37/+73
| |\ \ \ \
| * | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-0/+1
| * | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1811-80/+131
| |\ \ \ \ \
| * | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-2/+1
| * | | | | | Merge when build succeedsZeger-Jan van de Weg2015-11-021-0/+1
* | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-082-1/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-083-0/+17
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-072-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-031-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0218-35/+71
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-1910-73/+120
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-272-3/+7
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Disabling caching in test environment because it was causing issues with Mark...Douwe Maan2015-10-222-9/+15
* | | | | | | | | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement languages graph pageDmitriy Zaporozhets2015-12-081-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Fix signin with OmniAuth providersfix-omniauth-signinDouwe Maan2015-12-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-073-0/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-043-0/+17
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| |_|_|_|_|_|/ |/| | | | | |
View Lorry Controller Status