summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'local-markdown-version' into 'master'Douglas Barbosa Alexandre2019-02-0717-40/+118
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add local markdown version Closes #32789 See merge request gitlab-org/gitlab-ce!24822
| * | | | | | | | | | Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-0617-40/+118
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
* | | | | | | | | | Merge branch 'docs/source-installation-requirements' into 'master'Marin Jankovski2019-02-072-2/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update source installation to make it easier for release managers to work on releases Closes gitlab-org/release/framework#113 See merge request gitlab-org/gitlab-ce!24967
| * | | | | | | | | | Document adding source installation stepsdocs/source-installation-requirementsYorick Peterse2019-02-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a small line to the MR workflow to clarify that new source installation requirements have to be added when they are introduced, instead of release managers having to add them.
| * | | | | | | | | | Remove usage of 11-7-stable for source installsYorick Peterse2019-02-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of the branch 11-7-stable meant release managers would have to update this file every month, which is tedious and easy to overlook. To work around this, we simply use a placeholder and make it clear that the reader needs to replace this with the appropriate branch.
* | | | | | | | | | | Merge branch '56543-project-lists-further-iteration-improvements' into 'master'Annabel Dunstone Gray2019-02-075-38/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project lists: further iteration & improvements" Closes #56543 See merge request gitlab-org/gitlab-ce!24855
| * | | | | | | | | | | Improve project list UX on large screensMartin Wortschack2019-02-075-38/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove star button from project list - Switch to columns on desktop - Hide MR and issues on screens < 1200px - Remove not needed utility classes - Change avatar size to 48px - Set line-height of title row to 20px
* | | | | | | | | | | | Merge branch 'jlenny-NewAndroidTemplate' into 'master'Nick Thomas2019-02-073-0/+128
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template for Android with Fastlane See merge request gitlab-org/gitlab-ce!24722
| * | | | | | | | | | | | Template for Android with FastlaneJason Lenny2019-02-073-0/+128
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'Nick Thomas2019-02-074-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API support for setting squash commit message during squash Closes #56014 See merge request gitlab-org/gitlab-ce!24784
| * | | | | | | | | | | | API support for squash commit message during merge56014-api-merge-request-squash-commit-messagesLuke Duncalfe2019-02-074-0/+32
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues https://gitlab.com/gitlab-org/gitlab-ce/issues/47149 https://gitlab.com/gitlab-org/gitlab-ce/issues/56014
* | | | | | | | | | | | Merge branch 'fix-repo-settings-file-upload-error' into 'master'Nick Thomas2019-02-073-8/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing repository mirror settings UI to break Closes #55134 See merge request gitlab-org/gitlab-ce!23712
| * | | | | | | | | | | | Fix bug causing repo mirror settings UI to breakfix-repo-settings-file-upload-errorLuke Bennett2019-01-083-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an exception relating to the new project cleanup settings in 11.6 that causes the mirror repo settings UI to become unusable.
* | | | | | | | | | | | | Merge branch 'docs-pages-dns-update' into 'master'Achilleas Pipinellis2019-02-071-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: clarify DNS records for Pages Closes #42957 See merge request gitlab-org/gitlab-ce!24767
| * | | | | | | | | | | | Clarify DNS record for Pagesdocs-pages-dns-updateMarcia Ramos2019-01-291-7/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '57333-default_on_group_search_optimizations' into 'master'Sean McGivern2019-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable subquery for group issue search by default Closes #57333 See merge request gitlab-org/gitlab-ce!24978
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: added note to review/upgrade nginx See merge request gitlab-org/gitlab-ce!24944
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Backport build_auth_user for GroupSAML callback See merge request gitlab-org/gitlab-ce!24979
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API group labels Closes #44901 See merge request gitlab-org/gitlab-ce!21368
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to resolve conflicts for gitlab-ee!9224 See merge request gitlab-org/gitlab-ce!24889
| * | | | | | | | | | | | | | | | Use ee_else_ce alias for monitoring_bundleee-8346-hide-unlicensed-alertsSimon Knox2019-02-073-13/+11
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵Phil Hughes2019-02-0714-51/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master' Resolve "Lines changed statistics is not easily visible in MR changes view" Closes #52347 See merge request gitlab-org/gitlab-ce!24569
| * | | | | | | | | | | | | | | | | Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-0614-51/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the statistics in the compare-versions header for the entire MR Put them in the file header for each individual file
* | | | | | | | | | | | | | | | | | Merge branch 'adriel-remove-feature-flag' into 'master'Phil Hughes2019-02-077-7/+295
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ECharts metrics dashboard feature flag Closes #55910 and #54973 See merge request gitlab-org/gitlab-ce!24653
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code search when text is larger than max gRPC message size See merge request gitlab-org/gitlab-ce!24111
| * | | | | | | | | | | | | | | | Modifying gitaly search files client to add chunking supportJohn Cai2019-02-063-16/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates gitaly proto to 1.7.0, modifies the search files gitaly client call to use the new chunked_response flag in the rpc request, and stitch the responses together. maintains backwards compatibility with older gitaly servers.
* | | | | | | | | | | | | | | | | Merge branch 'update-docu-repository-mirroring' into 'master'Evan Read2019-02-071-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe how to set up a push mirror repository at GitLab Closes #57062 See merge request gitlab-org/gitlab-ce!24834
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>