summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Consolidate documentation written for e2e tests under dev docsdocs-qa-doc-consolidationddavison2019-05-3010-27/+37
| | | | | | | | | | | | Previously the documentation was separated. If we want to bake quality into the product, how better than to include everything we use directly in the development documentation Signed-off-by: ddavison <ddavison@gitlab.com> Fix broken internal doc link Move documentation for page objects to the e2e section
* Merge branch 'i18n-pgp_ssh_keys-of-user-profile' into 'master'12-0-stable-prepare-rc1Clement Ho2019-05-3012-36/+100
|\ | | | | | | | | Externalize strings of PGP Keys and SSH Keys page in user profile See merge request gitlab-org/gitlab-ce!28653
| * Externalize strings of PGP Keys and SSH Keys page in user profileantony liu2019-05-3012-36/+100
|/
* Merge branch '47846-position-is-off-when-visiting-files-with-anchors' into ↵Mike Greiling2019-05-302-0/+15
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Position is off when visiting files with anchors" Closes #47846 See merge request gitlab-org/gitlab-ce!28913
| * Add offset adjust to fix line positionJustin Boyson2019-05-302-0/+15
|/ | | | | Added offset adjustment for diff file header and version menus container divs. This should make the linked line be visible.
* Merge branch ↵Mike Greiling2019-05-301-8/+4
|\ | | | | | | | | | | | | 'ee-7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geo' into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13025 See merge request gitlab-org/gitlab-ce!28701
| * Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13025ee-7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geoValery Sizov2019-05-291-8/+4
| |
* | Merge branch 'extract-danger-roulette' into 'master'Nick Thomas2019-05-3011-186/+231
|\ \ | | | | | | | | | | | | Make single codebase roulette respect OOO status See merge request gitlab-org/gitlab-ce!28877
| * | Use roulette for single codebase rouletteextract-danger-rouletteLin Jen-Shin2019-05-302-12/+19
| | |
| * | Extract roulette to its own moduleLin Jen-Shin2019-05-309-174/+212
| | | | | | | | | | | | So it's more modular and extensible
* | | Merge branch '62485-label-weights' into 'master'Annabel Dunstone Gray2019-05-302-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Give all labels bold weight Closes #62485 See merge request gitlab-org/gitlab-ce!28895
| * | | Give all labels bold weight62485-label-weightsJarek Ostrowski2019-05-292-0/+11
| | | | | | | | | | | | | | | | | | | | Form check labels get normal weight Add changelog
* | | | Merge branch '11848-fix-broken-master-ce' into 'master'Dmitriy Zaporozhets2019-05-301-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Fix test with hard coded id See merge request gitlab-org/gitlab-ce!28933
| * | | | Fix test with hard coded idHeinrich Lee Yu2019-05-301-1/+3
| | | | |
* | | | | Merge branch 'fix-label-color-titles' into 'master'Sean McGivern2019-05-302-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent capitalization in label colors See merge request gitlab-org/gitlab-ce!28922
| * | | | | Fix inconsistent capitalization in label colorsHeinrich Lee Yu2019-05-302-6/+6
| |/ / / /
* | | | | Merge branch 'tkuah-codeowners' into 'master'Mayra Cabrera2019-05-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @tkuah to CODEOWNERS Closes gitlab-com/www-gitlab-com#3357 See merge request gitlab-org/gitlab-ce!28917
| * | | | | Add @tkuah to CODEOWNERStkuah-codeownersThong Kuah2019-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Re-sort alphabetically
* | | | | | Merge branch '61323-snippet-copy-icon-button-is-misaligned' into 'master'Annabel Dunstone Gray2019-05-307-7/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Snippet icon button is misaligned" Closes #61323 See merge request gitlab-org/gitlab-ce!28522
| * | | | | Get copy to clipboard button aligned within snippet headerMarcel van Remmerden2019-05-307-7/+14
|/ / / / /
* | | | | 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
|/ / / / / / / / / /