summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update spec/features/merge_request/user_resolves_conflicts_spec.rbPhil Hughes2019-02-071-0/+2
* Merge branch '57333-default_on_group_search_optimizations' into 'master'Sean McGivern2019-02-071-1/+1
|\
| * Delete 57333-default_on_group_search_optimizations.ymlSean McGivern2019-02-071-5/+0
| * Enable subquery for group issue search by default57333-default_on_group_search_optimizationsMario de la Ossa2019-02-062-1/+6
* | Merge branch 'docs-add-nginx-note' into 'master'Marcia Ramos2019-02-071-0/+5
|\ \
| * | Added correct syntax in nginx suggestion boxdocs-add-nginx-notesahbabou2019-02-061-0/+5
* | | Merge branch 'ce-jej/group-saml-sso-when-signed-out' into 'master'Nick Thomas2019-02-071-1/+5
|\ \ \
| * | | Backport build_auth_user for GroupSAML callbackce-jej/group-saml-sso-when-signed-outJames Edwards-Jones2019-02-061-1/+5
| | |/ | |/|
* | | Merge branch 'api-group-labels' into 'master'Sean McGivern2019-02-0713-102/+720
|\ \ \
| * | | Add documentationapi-group-labelsRobert Schilling2019-02-063-1/+203
| * | | Simplify label helper and correct versionRobert Schilling2019-01-314-73/+61
| * | | Factor out common label APIRobert Schilling2019-01-316-109/+129
| * | | Incorporate feedback from RobertRobert Schilling2019-01-315-120/+83
| * | | Correctly search for labels in parent groupsRobert Schilling2019-01-312-6/+6
| * | | Don't run subgroup tests for mysqlRobert Schilling2019-01-311-2/+2
| * | | Factor out group labels entityRobert Schilling2019-01-315-41/+31
| * | | Use proper finder helper to get existing labelsRobert Schilling2019-01-311-11/+13
| * | | fix rebasingRobert Schilling2019-01-312-10/+1
| * | | Replace findersRobert Schilling2019-01-312-5/+5
| * | | Incorporate feedback from NickRobert Schilling2019-01-317-23/+52
| * | | Use a schema matcher to capture all entity membersRobert Schilling2019-01-312-0/+18
| * | | Add changelog, version information, frozen string literalsRobert Schilling2019-01-313-0/+13
| * | | Add subscription API for the group label APIRobert Schilling2019-01-314-16/+117
| * | | Add specsRobert Schilling2019-01-313-8/+222
| * | | Inital API implementation for group labelsRobert Schilling2019-01-312-0/+87
* | | | Merge branch 'ee-8346-hide-unlicensed-alerts' into 'master'Fatih Acet2019-02-073-13/+11
|\ \ \ \
| * | | | Use ee_else_ce alias for monitoring_bundleee-8346-hide-unlicensed-alertsSimon Knox2019-02-073-13/+11
* | | | | Merge branch '52347-lines-changed-statistics-is-not-easily-visible-in-mr-chan...Phil Hughes2019-02-0714-51/+175
|\ \ \ \ \
| * | | | | Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-0614-51/+175
* | | | | | Merge branch 'adriel-remove-feature-flag' into 'master'Phil Hughes2019-02-077-7/+295
|\ \ \ \ \ \
| * | | | | | Remove ECharts metrics dashboard feature flagAdriel Santiago2019-02-077-7/+295
|/ / / / / /
* | | | | | Merge branch 'support-chunking-in-client' into 'master'Stan Hu2019-02-073-16/+99
|\ \ \ \ \ \
| * | | | | | Modifying gitaly search files client to add chunking supportJohn Cai2019-02-063-16/+99
* | | | | | | Merge branch 'update-docu-repository-mirroring' into 'master'Evan Read2019-02-071-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update repository_mirroring.md to correct list numberingJuergen Kosel2019-02-061-3/+3
| * | | | | | Use place holder for the destination host in the push mirror URLJuergen Kosel2019-02-061-1/+1
| * | | | | | Apply suggested changes from code reviewJuergen Kosel2019-02-061-4/+5
| * | | | | | Apply merge request suggestions regarding creation of personal access tokenJuergen Kosel2019-02-041-3/+1
| * | | | | | Describe how to set up a push mirror repository at GitLabJuergen Kosel2019-01-311-0/+9
* | | | | | | Merge branch 'docs-add-timesync-note' into 'master'Evan Read2019-02-071-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Update a note about time sync between GitLab and k8s clusterdocs-add-timesync-noteAlexander Tanayno2019-02-071-3/+3
| * | | | | | | Adds a note about time sync between GitLab and k8s clusterAlexander Tanayno2019-01-311-0/+6
* | | | | | | | Merge branch 'patch-37' into 'master'Evan Read2019-02-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Apply suggestion to doc/ci/variables/README.mdCraig Davidson2019-01-081-1/+1
| * | | | | | | | Added further details to the CI_PROJECT_DIR variable highlighting a dependenc...Craig Davidson2019-01-041-1/+1
* | | | | | | | | Merge branch 'bjk/56788_unicorn_labels' into 'master'Stan Hu2019-02-064-6/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update metrics docsbjk/56788_unicorn_labelsBen Kochie2019-02-061-0/+2
| * | | | | | | | | Clean up unicorn sampler metric labelsBen Kochie2019-02-063-6/+11
* | | | | | | | | | Merge branch 'gitaly-update-1.18.0' into 'master'Douglas Barbosa Alexandre2019-02-062-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Upgrade gitaly to 1.18.0Andrew Newdigate2019-02-062-1/+6
|/ / / / / / / / /