summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken gitlab.pot filepatch-56Sean McGivern2019-06-101-6/+3
|
* Merge remote-tracking branch 'origin/master' into patch-56Sean McGivern2019-06-102573-92923/+48568
|\
| * Merge branch 'ce-5276-3-update-ide-diff-and-mirror-modules' into 'master'Phil Hughes2019-06-102-7/+49
| |\ | | | | | | | | | | | | [CE for Part 3] Update IDE file mirror service (ce utils) See merge request gitlab-org/gitlab-ce!29360
| | * Update IDE file mirror service (ce utils)ce-5276-3-update-ide-diff-and-mirror-modulesPaul Slaughter2019-06-072-7/+49
| | | | | | | | | | | | | | | | | | **Notes:** This module is a client to the webide-file-sync service. https://gitlab.com/gitlab-org/webide-file-sync
| * | Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into ↵Thong Kuah2019-06-101-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add project Dependency List sidebar entry See merge request gitlab-org/gitlab-ce!29189
| | * | Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ceMark Florian2019-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | This is a CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13968.
| * | | Merge branch 'docs-update-delete-user' into 'master'Evan Read2019-06-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info to deleted user documentation Closes #62674 See merge request gitlab-org/gitlab-ce!29321
| | * | | Add clarity and commit info to deleted usersdocs-update-delete-userTristan Williams2019-06-061-1/+1
| | | | |
| * | | | Merge branch 'docs/ssot_group_videos' into 'master'Evan Read2019-06-101-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SSOT - Added link to video to enhance docs See merge request gitlab-org/gitlab-ce!29398
| | * | | | SSOT - Added link to video to enhance docsRussell Dickenson2019-06-101-0/+2
| |/ / / /
| * | | | Merge branch 'patch-32' into 'master'Evan Read2019-06-101-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify that GitLab CI token does not have write permissions See merge request gitlab-org/gitlab-ce!28089
| | * | | | Clarify that GitLab CI token does not have write permissionsBen Bodenmiller2019-06-101-4/+5
| |/ / / /
| * | | | Merge branch 'sh-troubleshooting-openid-docs' into 'master'Evan Read2019-06-101-0/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add OpenID Connect troubleshooting docs See merge request gitlab-org/gitlab-ce!29379
| | * | | | Add OpenID Connect troubleshooting docssh-troubleshooting-openid-docsStan Hu2019-06-071-0/+23
| | | |_|/ | | |/| |
| * | | | Merge branch 'docs/ssot_admin_area_index' into 'master'Evan Read2019-06-091-4/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edit Admin Area's index for SSOT See merge request gitlab-org/gitlab-ce!29327
| | * | | | Edit Admin Area's index for SSOTRussell Dickenson2019-06-091-4/+8
| |/ / / /
| * | | | Merge branch 'docs/ssot_visibility_controls' into 'master'Evan Read2019-06-091-10/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edit "Visibility and access controls" to meet SSOT guidelines See merge request gitlab-org/gitlab-ce!29171
| | * | | | Edit "Visibility and access controls" to meet SSOT guidelinesRussell Dickenson2019-06-091-10/+36
| |/ / / /
| * | | | Merge branch 'docs/ssot_subgroups' into 'master'Evan Read2019-06-091-19/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edit "Subgroups" for SSOT See merge request gitlab-org/gitlab-ce!29318
| | * | | | Edit "Subgroups" for SSOTRussell Dickenson2019-06-091-19/+38
| |/ / / /
| * | | | Merge branch 'docs/ssot-merge-requests' into 'master'Mike Lewis2019-06-0914-94/+266
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single source of truth for merge requests docs Closes #61516 See merge request gitlab-org/gitlab-ce!29269
| | * | | | Single source of truth for merge requestsAchilleas Pipinellis2019-06-0914-94/+266
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Edit pages under user/project/merge_requests and add the relevant types in the frontmatter. - Clean up descriptions. Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
| * | | | Merge branch 'sh-revert-mr-24679' into 'master'Kamil Trzciński2019-06-096-501/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '50070-legacy-attachments' into 'master'" See merge request gitlab-org/gitlab-ce!29391
| | * | | | Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679Stan Hu2019-06-096-501/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit fd19f887dfeeeedb483c4a4fb32f9f768e89389c, reversing changes made to abb2d4c601d796339c8d7cb0c00946696730f198.
| * | | | Merge branch 'sentry-raven_2.9' into 'master'Stan Hu2019-06-082-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump sentry-raven to 2.9 See merge request gitlab-org/gitlab-ce!29352
| | * | | | Bump sentry-raven to 2.9Utkarsh Gupta2019-06-072-2/+2
| | | | | |
| * | | | | Merge branch 'docs/fix-example-dot-net' into 'master'Mike Lewis2019-06-072-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove example.net, replace with example.com See merge request gitlab-org/gitlab-ce!25535
| | * \ \ \ \ Merge branch 'master' into 'docs/fix-example-dot-net'Mike Lewis2019-06-076958-130043/+325778
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | # Conflicts: # doc/user/project/clusters/serverless/index.md
| * | | | | | Merge branch '55033-discussion-system-note-alignment' into 'master'57953-suggesting-changes-on-a-line-that-is-not-part-of-an-mr-diff-brings-in-actual-html-code-of-the-element-instead-of-the-text-involvedFatih Acet2019-06-072-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align system note within discussion with other notes Closes #55033 See merge request gitlab-org/gitlab-ce!29367
| | * | | | | | Align system note within discussion with other notesAnnabel Dunstone Gray2019-06-072-3/+8
| | | | | | | |
| * | | | | | | Merge branch 'gt-externalize-profiles-preferences' into 'master'Phil Hughes2019-06-073-40/+46
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize profiles preferences Closes #53349 See merge request gitlab-org/gitlab-ce!28470
| | * | | | | | | Externalize profiles preferencesGeorge Tsiolis2019-06-073-40/+46
| | | | | | | | |
| * | | | | | | | Merge branch '61565-merge-request-discussion-text-jumps-when-resolved' into ↵Annabel Dunstone Gray2019-06-072-3/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge request discussion text jumps when resolved" Closes #61565 See merge request gitlab-org/gitlab-ce!28995
| | * | | | | | | | Fix discusson resolve toggle making page jumpJustin Boyson2019-06-072-3/+10
| |/ / / / / / / /
| * | | | | | | | Merge branch 'issue/62656' into 'master'Annabel Dunstone Gray2019-06-072-4/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed dropdown styles in board page See merge request gitlab-org/gitlab-ce!29338
| | * | | | | | | | Change styles for the board `Add List` dropdown to look more like the EE versionMichel Engelen2019-06-072-4/+10
| |/ / / / / / / /
| * | | | | | | | Merge branch 'winh-new-list-sorting' into 'master'Tim Zallmann2019-06-071-3/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove list sorting from NewListDropdown See merge request gitlab-org/gitlab-ce!29077
| | * | | | | | | | Remove list sorting from NewListDropdownWinnie Hellmann2019-06-071-3/+0
| |/ / / / / / / /
| * | | | | | | | Merge branch 'bw-gettext-rake-task' into 'master'Sean McGivern2019-06-071-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Show description of 'gettext:regenerate' task See merge request gitlab-org/gitlab-ce!29362
| | * | | | | | | Show description of 'gettext:regenerate' taskbw-gettext-rake-taskBrett Walker2019-06-071-0/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'docs-scoped-label-key' into 'master'Mike Lewis2019-06-071-0/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about nested scopes matching See merge request gitlab-org/gitlab-ce!28466
| | * | | | | | | Apply suggestion to doc/user/project/labels.mddocs-scoped-label-keyJan Provaznik2019-06-051-5/+7
| | | | | | | | |
| | * | | | | | | Add a note about nested scopes matchingJan Provaznik2019-05-201-0/+6
| | | | | | | | |
| * | | | | | | | Merge branch 'ee-9688-fe-mr-merge-order' into 'master'Clement Ho2019-06-076-15/+115
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of EE Displaying Blocking MRs See merge request gitlab-org/gitlab-ce!29095
| | * | | | | | | | Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-orderSam Bigelow2019-06-056-15/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR is a backport of an EE merge request
| * | | | | | | | | Merge branch 'mh/board-models-ce' into 'master'Kushal Pandya2019-06-0712-30/+28
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move issue board models to boards directory Closes #61293 See merge request gitlab-org/gitlab-ce!29260
| | * | | | | | | | | Move Vue models from vue_shared to boardsMartin Hanzel2019-06-0712-30/+28
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
| * | | | | | | | | Merge branch ↵Stan Hu2019-06-0711-8/+95
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
| | * | | | | | | | | Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137mfluharty2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set masked to true before testing now that the default is false
| | * | | | | | | | | Do not escape forward slashes in Maskable REGEXMatija Čupić2019-06-061-1/+1
| | | | | | | | | | |