Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'more-group-api-sorting-options' into 'master' | Douwe Maan | 2018-06-19 | 5 | -8/+60 |
|\ | |||||
| * | Add id as second sort parameter for group sort by name | Marko, Peter | 2018-06-18 | 3 | -2/+38 |
| * | Ensure ordering for group sorting tests | Marko, Peter | 2018-06-15 | 1 | -4/+4 |
| * | Add id group api sorting option | Marko, Peter | 2018-06-12 | 4 | -7/+23 |
* | | Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master' | Rémy Coutable | 2018-06-19 | 7 | -1/+11 |
|\ \ | |||||
| * | | Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-views | Sean McGivern | 2018-06-18 | 2 | -1/+3 |
| * | | Remove EE-specific code from rejection mailer | Sean McGivern | 2018-06-18 | 2 | -0/+2 |
| * | | Remove EE-specific code from logs tree dropdown | Sean McGivern | 2018-06-18 | 1 | -0/+2 |
| * | | Remove EE-specific code from project milestone page | Sean McGivern | 2018-06-18 | 1 | -0/+2 |
| * | | Remove EE-specific code from blob header | Sean McGivern | 2018-06-18 | 1 | -0/+2 |
* | | | Merge branch 'docs/contributing-md-labels' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -34/+48 |
|\ \ \ | |||||
| * | | | Remove label examples from headings | Achilleas Pipinellis | 2018-06-19 | 1 | -34/+48 |
* | | | | Merge branch 'zj-linguist-gitaly-mandatory' into 'master' | Douwe Maan | 2018-06-19 | 1 | -27/+19 |
|\ \ \ \ | |||||
| * | | | | Move language detection to mandatory | Zeger-Jan van de Weg | 2018-06-19 | 1 | -27/+19 |
* | | | | | Merge branch 'zj-gitaly-squash' into 'master' | Douwe Maan | 2018-06-19 | 1 | -27/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Rebase and Squash in progress are Gitaly only | Zeger-Jan van de Weg | 2018-06-19 | 1 | -27/+4 |
* | | | | | | Merge branch 'zj-info-attributes' into 'master' | Douwe Maan | 2018-06-19 | 1 | -15/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move info attributes to mandatory | Zeger-Jan van de Weg | 2018-06-19 | 1 | -15/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-commit-count' into 'master' | Douwe Maan | 2018-06-19 | 1 | -18/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move count commit to mandatory | Zeger-Jan van de Weg | 2018-06-19 | 1 | -18/+2 |
* | | | | | | | Merge branch 'zj-gitaly-license-detection' into 'master' | Douwe Maan | 2018-06-19 | 2 | -31/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | License detection happens soley through Gitaly now | Zeger-Jan van de Weg | 2018-06-19 | 2 | -31/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'replace-omniauth.org-sedo-doc' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix omniauth link, site has moved. | julianladisch | 2018-06-18 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make it explicit where is the gitlab.rb file | Mike Weilgart | 2018-06-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jr-45820-xcode-docs' into 'master' | Douwe Maan | 2018-06-19 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix typosjr-45820-xcode-docs | James Ramsay | 2018-06-18 | 1 | -2/+2 |
| * | | | | | | | | | Add Open in Xcode docs | James Ramsay | 2018-06-14 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs48093-fix-flakey-notes-background-process-specs | Eric Eastwood | 2018-06-18 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'rails5-fix-46276' into 'master' | Rémy Coutable | 2018-06-19 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Rails5 fix format in uploads actions | Jasper Maes | 2018-06-18 | 2 | -0/+18 |
* | | | | | | | | | | | | Merge branch 'rs-soft-removed-objects-spec-parity' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -7/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rbrs-soft-removed-objects-spec-parity | Robert Speicher | 2018-06-18 | 1 | -7/+29 |
* | | | | | | | | | | | | Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master' | Rémy Coutable | 2018-06-19 | 4 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parity | Robert Speicher | 2018-06-18 | 2 | -2/+2 |
| * | | | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/config_spec.rb | Robert Speicher | 2018-06-18 | 1 | -1/+1 |
| * | | | | | | | | | | | CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rb | Robert Speicher | 2018-06-18 | 1 | -1/+1 |
| * | | | | | | | | | | | CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | Robert Speicher | 2018-06-18 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'rails5-nil-formats' into 'master' | Rémy Coutable | 2018-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix nil formats testrails5-nil-formats | Jan Provaznik | 2018-06-16 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'docs/fix-yaml-indentation' into 'master' | Achilleas Pipinellis | 2018-06-19 | 1 | -44/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix indentation in CI yaml | pityonline | 2018-06-14 | 1 | -44/+44 |
* | | | | | | | | | | | | Merge branch 'jivl-fix-checkbox-top-margin' into 'master' | Annabel Gray | 2018-06-18 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove top margin from checkboxes in integrations page | Jose | 2018-06-18 | 1 | -7/+0 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch '48072-bs4-labels-in-issues-system-notes-are-misaligned-again' i... | Annabel Gray | 2018-06-18 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Resolve "BS4: Labels in issues system notes are misaligned again" | Clement Ho | 2018-06-18 | 1 | -1/+4 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch '48050-add-full-commit-sha' into 'master' | Tim Zallmann | 2018-06-18 | 4 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Uses long sha version of the merged commit in MR widget copy to clipboard bu...48050-add-full-commit-sha | Filipa Lacerda | 2018-06-18 | 4 | -3/+10 |