summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix button text wrapping to next line60116-fix-button-wrappingAnnabel Dunstone Gray2019-04-052-0/+6
* Merge branch '59719-const-get' into 'master'Robert Speicher2019-04-051-1/+1
|\
| * Switch to Object.const_get59719-const-getThong Kuah2019-04-051-1/+1
| * Do not inherit when calling const_getThong Kuah2019-04-041-1/+1
* | Merge branch 'port-6539-extract-ee-specific-code' into 'master'Robert Speicher2019-04-051-0/+1
|\ \
| * | Extract EE specific files/lines for quick actions testsport-6539-extract-ee-specific-codeAlexandru Croitor2019-04-031-0/+1
* | | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-05103-3058/+35
|\ \ \
| * | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-05103-3058/+35
* | | | Merge branch 'revert-39eb16aa' into 'master'Sean McGivern2019-04-0518-64/+50
|\ \ \ \
| * | | | Revert "Merge branch 'require-all-templates-to-include-default-stages' into '...Sean McGivern2019-04-0518-64/+50
* | | | | Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'Phil Hughes2019-04-0515-72/+238
|\ \ \ \ \
| * | | | | Shortcut to create MR in web IDE57482-shortcut-to-create-merge-request-from-web-ideSam Bigelow2019-04-0415-72/+238
* | | | | | Merge branch '9201-create-a-user-via-scim-ce' into 'master'Douglas Barbosa Alexandre2019-04-051-1/+5
|\ \ \ \ \ \
| * | | | | | Add saml provider to user build service9201-create-a-user-via-scim-ceJames Lopez2019-04-051-1/+5
* | | | | | | Merge branch '57668-create-file-from-url' into 'master'Phil Hughes2019-04-058-17/+271
|\ \ \ \ \ \ \
| * | | | | | | Set tree list accounting for already-opened files57668-create-file-from-urlDenys Mishunov2019-04-046-17/+249
| * | | | | | | Create a new file if URL references non-existent oneDenys Mishunov2019-04-042-0/+22
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'winh-jest-ee_else_ce' into 'master'Phil Hughes2019-04-051-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Add ee_else_ce to Jest configwinh-jest-ee_else_ceWinnie Hellmann2019-04-051-4/+7
* | | | | | | | Merge branch 'allow-ref-name-caching-projects-controller' into 'master'Douglas Barbosa Alexandre2019-04-055-0/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Enable FindCommit caching for project and commits pagesStan Hu2019-04-055-0/+15
* | | | | | | | Merge branch 'remove-ci-charts-undescriptive-header' into 'master'Filipa Lacerda2019-04-0547-139/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Removes the undescriptive CI Charts headerDimitrie Hoekstra2019-04-0547-139/+5
|/ / / / / / /
* | | | | | | Merge branch 'mc/fix/ci-variable-qa' into 'master'Sanad Liaquat2019-04-051-5/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove spaces from variable namemc/fix/ci-variable-qaMatija Čupić2019-04-051-5/+4
* | | | | | | Merge branch 'if-57131-external_auth_to_ce' into 'master'Andreas Brandl2019-04-05103-35/+3058
|\ \ \ \ \ \ \
| * | | | | | | Move Contribution Analytics related spec in spec/features/groups/group_page_w...Imre Farkas2019-04-05103-35/+3058
|/ / / / / / /
* | | | | | | Merge branch '57493-add-limit-to-user-name' into 'master'Andreas Brandl2019-04-055-1/+53
|\ \ \ \ \ \ \
| * | | | | | | Add limit of 128 characters to users name57493-add-limit-to-user-nameBrandon Labuschagne2019-04-055-1/+53
* | | | | | | | Merge branch 'docs/point-to-new-chart-links' into 'master'Marcia Ramos2019-04-0512-931/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Redirect Kubernetes installation to the charts docsdocs/point-to-new-chart-linksAchilleas Pipinellis2019-03-1912-931/+46
* | | | | | | | | Merge branch 'docs-run-pipeline-on-merge-ref' into 'master'Marcia Ramos2019-04-054-12/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs for use combined merge refs with merge request pipelinesShinya Maeda2019-04-054-12/+63
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bvl-fix-git-pull-repo-when-project-does-not-exist' into 'master'Douwe Maan2019-04-055-7/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fall back to project repository type by defaultBob Van Landuyt2019-04-055-7/+30
|/ / / / / / / / /
* | | | | | | | | Merge branch 'keyval-labels' into 'master'Sean McGivern2019-04-0536-99/+573
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix scoped links styling on milestones pageJan Provaznik2019-04-051-2/+1
| * | | | | | | | | Fix labels selection, escape text in templateskeyval-labelsKushal Pandya2019-04-051-9/+11
| * | | | | | | | | Fix scoped_labels feature checkJan Provaznik2019-04-044-5/+29
| * | | | | | | | | [backend] backport of scoped labelsJan Provaznik2019-04-0414-31/+78
| * | | | | | | | | [frontend] backport of scoped labelsRajat Jain2019-04-0420-65/+467
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-0518-50/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Require all templates to use default stagesKamil Trzciński2019-04-0518-50/+64
* | | | | | | | | | Merge branch 'sh-update-rails-5.0.7.2' into 'master'Robert Speicher2019-04-053-36/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Upgrade globalid and i8n gems to match Rails 5.0.7.2sh-update-rails-5.0.7.2Stan Hu2019-04-041-2/+2
| * | | | | | | | | Update Rails to 5.0.7.2Stan Hu2019-04-043-34/+39
* | | | | | | | | | Merge branch 'gitaly-version-v1.32.0' into 'master'Douwe Maan2019-04-052-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Upgrade Gitaly to v1.32.0GitalyBot2019-04-052-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bump_kubernetes_1_11_9' into 'master'Douwe Maan2019-04-053-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump Helm to 2.13.1 and kubectl to 1.11.9bump_kubernetes_1_11_9Thong Kuah2019-04-053-3/+8
| | |_|/ / / / / / / | |/| | | | | | | |