summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Force push is handled by Gitaly nowzj-force-push-opt-outZeger-Jan van de Weg2018-06-195-46/+11
* Merge branch '45487-slack-tag-push-notifs' into 'master'Sean McGivern2018-06-193-17/+70
|\
| * ChatNotificationService - fix sending tag notifications when "only default br...45487-slack-tag-push-notifsMario de la Ossa2018-06-143-17/+70
* | Merge branch 'sh-optimize-locks-check-ce' into 'master'Sean McGivern2018-06-195-1/+44
|\ \
| * | Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ceStan Hu2018-06-185-1/+44
* | | Merge branch 'more-group-api-sorting-options' into 'master'Douwe Maan2018-06-195-8/+60
|\ \ \
| * | | Add id as second sort parameter for group sort by nameMarko, Peter2018-06-183-2/+38
| * | | Ensure ordering for group sorting testsMarko, Peter2018-06-151-4/+4
| * | | Add id group api sorting optionMarko, Peter2018-06-124-7/+23
* | | | Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master'Rémy Coutable2018-06-197-1/+11
|\ \ \ \
| * | | | Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-viewsSean McGivern2018-06-182-1/+3
| * | | | Remove EE-specific code from rejection mailerSean McGivern2018-06-182-0/+2
| * | | | Remove EE-specific code from logs tree dropdownSean McGivern2018-06-181-0/+2
| * | | | Remove EE-specific code from project milestone pageSean McGivern2018-06-181-0/+2
| * | | | Remove EE-specific code from blob headerSean McGivern2018-06-181-0/+2
* | | | | Merge branch 'docs/contributing-md-labels' into 'master'Rémy Coutable2018-06-191-34/+48
|\ \ \ \ \
| * | | | | Remove label examples from headingsAchilleas Pipinellis2018-06-191-34/+48
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-linguist-gitaly-mandatory' into 'master'Douwe Maan2018-06-191-27/+19
|\ \ \ \ \
| * | | | | Move language detection to mandatoryZeger-Jan van de Weg2018-06-191-27/+19
* | | | | | Merge branch 'zj-gitaly-squash' into 'master'Douwe Maan2018-06-191-27/+4
|\ \ \ \ \ \
| * | | | | | Rebase and Squash in progress are Gitaly onlyZeger-Jan van de Weg2018-06-191-27/+4
* | | | | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-06-191-15/+1
|\ \ \ \ \ \ \
| * | | | | | | Move info attributes to mandatoryZeger-Jan van de Weg2018-06-191-15/+1
| |/ / / / / /
* | | | | | | Merge branch 'zj-commit-count' into 'master'Douwe Maan2018-06-191-18/+2
|\ \ \ \ \ \ \
| * | | | | | | Move count commit to mandatoryZeger-Jan van de Weg2018-06-191-18/+2
* | | | | | | | Merge branch 'zj-gitaly-license-detection' into 'master'Douwe Maan2018-06-192-31/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | License detection happens soley through Gitaly nowZeger-Jan van de Weg2018-06-192-31/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'replace-omniauth.org-sedo-doc' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix omniauth link, site has moved.julianladisch2018-06-181-1/+1
* | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make it explicit where is the gitlab.rb fileMike Weilgart2018-06-181-1/+1
* | | | | | | | | | Merge branch 'jr-45820-xcode-docs' into 'master'Douwe Maan2018-06-191-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typosjr-45820-xcode-docsJames Ramsay2018-06-181-2/+2
| * | | | | | | | | | Add Open in Xcode docsJames Ramsay2018-06-141-0/+8
* | | | | | | | | | | Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs48093-fix-flakey-notes-background-process-specsEric Eastwood2018-06-181-1/+1
* | | | | | | | | | | | Merge branch 'rails5-fix-46276' into 'master'Rémy Coutable2018-06-192-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rails5 fix format in uploads actionsJasper Maes2018-06-182-0/+18
* | | | | | | | | | | | | Merge branch 'rs-soft-removed-objects-spec-parity' into 'master'Rémy Coutable2018-06-191-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rbrs-soft-removed-objects-spec-parityRobert Speicher2018-06-181-7/+29
* | | | | | | | | | | | | Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'Rémy Coutable2018-06-194-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parityRobert Speicher2018-06-182-2/+2
| * | | | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/config_spec.rbRobert Speicher2018-06-181-1/+1
| * | | | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rbRobert Speicher2018-06-181-1/+1
| * | | | | | | | | | | | CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rbRobert Speicher2018-06-181-1/+1
* | | | | | | | | | | | | Merge branch 'rails5-nil-formats' into 'master'Rémy Coutable2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix nil formats testrails5-nil-formatsJan Provaznik2018-06-161-1/+1
* | | | | | | | | | | | | Merge branch 'docs/fix-yaml-indentation' into 'master'Achilleas Pipinellis2018-06-191-44/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix indentation in CI yamlpityonline2018-06-141-44/+44
* | | | | | | | | | | | | Merge branch 'jivl-fix-checkbox-top-margin' into 'master'Annabel Gray2018-06-181-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \