summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'fix-deprecation-warning' into 'master'Clement Ho2017-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix deprecation warning present during webpack compilesMike Greiling2017-08-251-1/+1
* | | | | | | | | | | | | | | Merge branch 'authentiq-docs' into 'master'Achilleas Pipinellis2017-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Point to /developers on docs/administration/authentiq.mdAlexandros Keramidas2017-08-211-1/+1
* | | | | | | | | | | | | | | Merge branch 'replace_spinach_search_code.feature' into 'master'Robert Speicher2017-08-256-61/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Replace 'source/search_code.feature' spinach test with an rspec analogblackst0ne2017-08-257-65/+63
| * | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-24297-1144/+2005
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-22158-2879/+2608
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceblackst0ne2017-08-182-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'blackst0ne2017-08-186223-88244/+226867
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add index on ci_runners.contacted_atblackst0ne2017-04-283-1/+25
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-update-links-guideline' into 'master'Achilleas Pipinellis2017-08-252-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Indexes GFM markdown guidedocs-update-links-guidelineMarcia Ramos2017-08-181-0/+7
| * | | | | | | | | | | | | | | | | | | use inline links instead of referencedMarcia Ramos2017-08-181-7/+6
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs-add-deprecation-note-build-vars' into 'master'Achilleas Pipinellis2017-08-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update README.mddocs-add-deprecation-note-build-varsFabio Busatto2017-08-241-0/+5
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-fix-mysql-bare-repository-importer' into 'master'Sean McGivern2017-08-253-62/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importerBob Van Landuyt2017-08-253-62/+133
* | | | | | | | | | | | | | | | | | | | | | Merge branch '35721-auth-style-confirmation' into 'master'Clement Ho2017-08-253-37/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |