summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Eager load head pipeline projects for MRs indexmr-index-eager-loadYorick Peterse2017-08-282-1/+16
* Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-08-284-61/+63
|\
| * Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-274-61/+63
* | Merge branch 'bugfix.notify-custom-participants' into 'master'Sean McGivern2017-08-284-31/+46
|\ \
| * | add a description to the changelogbugfix.notify-custom-participantshttp://jneen.net/2017-08-221-1/+1
| * | add a changeloghttp://jneen.net/2017-08-211-0/+5
| * | rm a comment that is a liehttp://jneen.net/2017-08-211-1/+0
| * | don't rely on order of notification levelshttp://jneen.net/2017-08-211-27/+26
| * | actually use the :participating notification typehttp://jneen.net/2017-08-211-1/+1
| * | add a spec for a participant with a :custom settinghttp://jneen.net/2017-08-211-2/+14
* | | Merge branch 'docs/update-ci-docker-using-docker-images' into 'master'Achilleas Pipinellis2017-08-282-7/+38
|\ \ \
| * | | Update 'Using Docker images' documentationTomasz Maczukin2017-08-282-7/+38
|/ / /
* | | Merge branch 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' into 'master'Grzegorz Bizon2017-08-2822-35/+197
|\ \ \
| * \ \ Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into backstage/gb/ren...backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-2647-227/+543
| |\ \ \ | | | |/ | | |/|
| * | | Migrate new jobs when reverting pipeline queues migrationGrzegorz Bizon2017-08-252-2/+10
| * | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-25474-1566/+2878
| |\ \ \
| * | | | Fix invalid default argument in migration helpersGrzegorz Bizon2017-08-231-1/+1
| * | | | Enqueue a new stage worker in CI/CD processing queueGrzegorz Bizon2017-08-221-0/+2
| * | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-22117-2255/+1506
| |\ \ \ \
| * | | | | Fix indentation in migration helpersGrzegorz Bizon2017-08-221-9/+9
| * | | | | Add specs for pipeline sidekiq queues migrationGrzegorz Bizon2017-08-221-0/+50
| * | | | | Add migration that migrates CI/CD queuesGrzegorz Bizon2017-08-222-1/+15
| * | | | | Add Sidekiq migration helpers for migrating queuesGrzegorz Bizon2017-08-222-3/+62
| * | | | | Revert adding shared examples for every sidekiq workerGrzegorz Bizon2017-08-2256-120/+0
| * | | | | Fix incorrect `let` in pipeline metrics worker specsGrzegorz Bizon2017-08-221-1/+8
| * | | | | Fix inconsistent Sidekiq queues names in worker specsGrzegorz Bizon2017-08-221-1/+1
| * | | | | Fix typo in shared examples name in worker specsGrzegorz Bizon2017-08-221-1/+1
| * | | | | Include build queue worker in the processing groupGrzegorz Bizon2017-08-221-1/+3
| * | | | | Add sidekiq worker shared examples to workers specsGrzegorz Bizon2017-08-2144-2/+88
| * | | | | Adjust sidekiq queues weights in queues config fileGrzegorz Bizon2017-08-211-3/+3
| * | | | | Assign some CI/CD workers to pipeline default queueGrzegorz Bizon2017-08-214-7/+1
| * | | | | Remove sidekiq build queue and assign pipeline queueGrzegorz Bizon2017-08-2112-27/+25
| * | | | | Assign all pipeline workers to specific queuesGrzegorz Bizon2017-08-2113-0/+27
| * | | | | Simplify pipeline sidekiq queues naming schemeGrzegorz Bizon2017-08-214-10/+10
| * | | | | Make it possible to check if worker uses a known queueGrzegorz Bizon2017-08-213-0/+13
| * | | | | Extend pipelines queue mixin and add a default queueGrzegorz Bizon2017-08-213-3/+25
* | | | | | Merge branch 'jej/remove-dependent-destroy-from-protected-refs' into 'master'Yorick Peterse2017-08-281-1/+1
|\ \ \ \ \ \
| * | | | | | Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels"jej/remove-dependent-destroy-from-protected-refsJames Edwards-Jones2017-08-251-1/+1
* | | | | | | Merge branch 'sh-system-hooks-ldap-users' into 'master'Grzegorz Bizon2017-08-275-6/+39
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fire system hooks when a user is created via LDAP or OAuthsh-system-hooks-ldap-usersStan Hu2017-08-255-6/+39
|/ / / / / /
* | | | | | Merge branch 'fix-repo-scrollbar' into 'master'Jacob Schatz2017-08-251-1/+0
|\ \ \ \ \ \
| * | | | | | Fix repo editor scrollbarfix-repo-scrollbarClement Ho2017-08-241-1/+0
* | | | | | | Merge branch '36828-create-a-common-docker-documentation-resource-docs' into ...Marcia Ramos2017-08-253-6/+20
|\ \ \ \ \ \ \
| * | | | | | | Common Docker Documentation Location in `gitlab-ce`Joshua Lambert2017-08-253-6/+20
|/ / / / / / /
* | | | | | | Merge branch 'docs-clarify-dependencies' into 'master'Achilleas Pipinellis2017-08-251-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Update README.mddocs-clarify-dependenciesFabio Busatto2017-08-231-0/+2
* | | | | | | | Merge branch 'sh-sidekiq-backtrace' into 'master'Robert Speicher2017-08-256-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable 5 lines of Sidekiq backtrace lines to aid in debuggingsh-sidekiq-backtraceStan Hu2017-08-256-0/+13
* | | | | | | | | Merge branch 'docs-document-version-for-group-milestones-api' into 'master'Achilleas Pipinellis2017-08-252-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document version Group Milestones API introducedMark Fletcher2017-08-242-0/+10
View Lorry Controller Status