summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standardsSean McGivern2019-05-308-33/+105
|\ | | | | | | | | | | | | Support sorting issues using `relative_position` Closes #62178 See merge request gitlab-org/gitlab-ce!28566
| * Check for manual_sorting feature flag9121-sort-relative-positionBrett Walker2019-05-281-1/+1
| |
| * Allow issues to be sorted by relative_positionBrett Walker2019-05-288-33/+105
| | | | | | | | | | - adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
* | Merge branch 'referenced-labels' into 'master'Kushal Pandya2019-05-302-1/+7
|\ \ | | | | | | | | | | | | Add referenced-commands in no overflow list See merge request gitlab-org/gitlab-ce!28858
| * | Add referenced-commands in no overflow listreferenced-labelsRajat Jain2019-05-292-1/+7
| | |
* | | Merge branch 'i18n-active_sessions-in-user-profile' into 'master'Kushal Pandya2019-05-304-7/+28
|\ \ \ | | | | | | | | | | | | | | | | Externalize strings of active sessions page in user profile See merge request gitlab-org/gitlab-ce!28590
| * | | Externalize strings of active sessions page in user profileantony liu2019-05-304-7/+28
|/ / /
* | | Merge branch 'issue/11040' into 'master'Filipa Lacerda2019-05-302-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Backport of EE change in `app/views/search/_form.html.haml` See merge request gitlab-org/gitlab-ce!28883
| * | | Backport of EE change in `app/views/search/_form.html.haml`Michel Engelen2019-05-302-0/+6
|/ / /
* | | Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'Filipa Lacerda2019-05-3025-54/+150
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show Pipeline IID everywhere Pipeline ID is shown. Closes #57414 See merge request gitlab-org/gitlab-ce!26853
| * | | Add Pipeline IID to viewsMike Scott2019-05-3025-54/+150
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Pipeline IID to MR's * Add Pipeline IID to commit box * Add Pipeline IID to builds page * Add Pipeline IID to job sidebar * Add Pipeline IID to header on view pipeline pages * Add changelog entry * Update tests
* | | Merge branch '6104-ee-ce-difference' into 'master'Filipa Lacerda2019-05-303-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unified repository/show.html for CE and EE Closes gitlab-ee#6104 See merge request gitlab-org/gitlab-ce!28868
| * | | Unified repository/show.html for CE and EE6104-ee-ce-differenceDenys Mishunov2019-05-293-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Corresponding partials containing differences have been added to corresponding folder. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6104
* | | | Merge branch 'vue-repo-parent-row-fixes' into 'master'Filipa Lacerda2019-05-302-2/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes bug with parent row component triggering multiple Vue router pushes See merge request gitlab-org/gitlab-ce!28882
| * | | | Fixes bug with parent row component triggering multiple Vue router pushesPhil Hughes2019-05-292-2/+66
| | | | |
* | | | | Merge branch 'graphql-batch-requests-ee' into 'master'Filipa Lacerda2019-05-305-13/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable GraphQL batch requests See merge request gitlab-org/gitlab-ce!28370
| * | | | | Added spec for authenticating multiplex queriesPhil Hughes2019-05-291-5/+24
| | | | | |
| * | | | | Enable GraphQL batch requestsPhil Hughes2019-05-294-8/+37
| | |_|/ / | |/| | |
* | | | | Merge branch '62487-external-policy-desc' into 'master'Phil Hughes2019-05-302-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move text under p tag Closes #62487 See merge request gitlab-org/gitlab-ce!28901
| * | | | | Move text under p tag62487-external-policy-descJarek Ostrowski2019-05-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add changelog
* | | | | | Merge branch '61393-emoji-button' into 'master'Filipa Lacerda2019-05-301-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix color of emoji button Closes #61393 See merge request gitlab-org/gitlab-ce!28889
| * | | | | | Fix color of emoji button61393-emoji-buttonAnnabel Dunstone Gray2019-05-291-3/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-remove-chrome-apt-dependency-ci' into 'master'Lin Jen-Shin2019-05-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Google apt source from gitlab:assets:compile step See merge request gitlab-org/gitlab-ce!28905
| * | | | | | Remove Google apt source from gitlab:assets:compile stepStan Hu2019-05-301-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Chrome is already installed in this image, and the apt-get update is only used to install jq.
* | | | | | Merge branch 'winh-issue-boards-clearDetailIssue' into 'master'Phil Hughes2019-05-304-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract clearDetailIssue() to issue boards store See merge request gitlab-org/gitlab-ce!28825
| * | | | | | Extract clearDetailIssue() to issue boards storeWinnie Hellmann2019-05-304-2/+16
|/ / / / / /
* | | | | | Merge branch '61788-predefined-colours-dont-have-descriptive-labels' into ↵Jan Provaznik2019-05-306-36/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix for #61788 predefined colours dont have descriptive labels Closes #61788 See merge request gitlab-org/gitlab-ce!28343
| * | | | | | Fix for #61788 predefined colours dont have descriptive labelsChris Toynbee2019-05-306-36/+104
| | | | | | |
* | | | | | | Merge branch 'docs/ssot-diff-limits' into 'master'Achilleas Pipinellis2019-05-301-11/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update diff_limits.md See merge request gitlab-org/gitlab-ce!28459
| * | | | | | | Update diff_limits.mdRussell Dickenson2019-05-301-11/+30
|/ / / / / / /
* | | | | | | Merge branch 'docs-omnibus-grafana' into 'master'Achilleas Pipinellis2019-05-301-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list omnibus grafana installation details See merge request gitlab-org/gitlab-ce!28269
| * | | | | | | list omnibus grafana installation detailsdocs-omnibus-grafanaBen Bodenmiller2019-05-111-3/+5
| | | | | | | |
* | | | | | | | Merge branch 'docs-ssot-ci-2' into 'master'Achilleas Pipinellis2019-05-308-6/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: ssot ci/*/files See merge request gitlab-org/gitlab-ce!28802
| * | | | | | | | Add doc typeMarcia Ramos2019-05-308-6/+35
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | For ssot epic
* | | | | | | | Merge branch 'docs-ssot-ci-1' into 'master'Achilleas Pipinellis2019-05-306-0/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: ssot ci/files See merge request gitlab-org/gitlab-ce!28801
| * | | | | | | | Add doc typedocs-ssot-ci-1Marcia Ramos2019-05-276-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For ssot epic
* | | | | | | | | Merge branch 'docs-its-relative-1' into 'master'Achilleas Pipinellis2019-05-304-20/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Change links to relative in /topics docs See merge request gitlab-org/gitlab-ce!28912
| * | | | | | | | | Docs: Change links to relative in /topics docsMarcel Amirault2019-05-304-20/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-ssot-ci-services' into 'master'Achilleas Pipinellis2019-05-304-4/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: ssot - ci services See merge request gitlab-org/gitlab-ce!28800
| * | | | | | | | | Add doc typeMarcia Ramos2019-05-304-4/+21
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | For CI services examples
* | | | | | | | | Merge branch 'tpresa-fix-highest-role-docs' into 'master'Achilleas Pipinellis2019-05-301-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix highest role docs See merge request gitlab-org/gitlab-ce!28892
| * | | | | | | | | Fix highest role docsThiago Presa2019-05-301-3/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for the highest_role field was incorrectly added to the /users endpoint. This commit adds it to the /users/:id
* | | | | | | | | Merge branch 'jl-update-components-k8s-apps-docs' into 'master'Achilleas Pipinellis2019-05-301-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Kubernetes Cluster Apps to GitLab Managed Apps See merge request gitlab-org/gitlab-ce!28894
| * | | | | | | | | Rename Kubernetes Cluster Apps to GitLab Managed Appsjl-update-components-k8s-apps-docsJoshua Lambert2019-05-291-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'qa-reload-to-check-branches-deleted' into 'master'Ramya Authappan2019-05-302-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Reload page to check if branch is deleted See merge request gitlab-org/gitlab-ce!28583
| * | | | | | | | | | Reload page to check if branch is deletedqa-reload-to-check-branches-deletedMark Lapierre2019-05-242-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the "Delete merged branches" button is used the UI doesn't update automatically. So when the page is refreshed it's possible that the branch will still be present. This checks for the branch to be gone and reloads if it is not, repeating until the default timeout (60s).
* | | | | | | | | | | Merge branch 'docs-hackathon-5' into 'master'Evan Read2019-05-304-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix 4 docs to resolve follow-up issue Closes #61994 See merge request gitlab-org/gitlab-ce!28910
| * | | | | | | | | | | Docs: Fix 4 docs to resolve follow-up issueMarcel Amirault2019-05-304-2/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/third-iteration-on-writing-end-to-end-tests-doc' into ↵Mark Lapierre2019-05-302-162/+262
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Third iteration on writing end to end tests doc Closes #62158 See merge request gitlab-org/gitlab-ce!28716
| * | | | | | | | | | | Lots of adjustments in the writing tests docWalmyr2019-05-302-162/+262
|/ / / / / / / / / / /