summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflictsStan Hu2019-06-102-10/+17
* Fix UTF-8 conversion issues when resolving conflictsStan Hu2019-06-103-2/+19
* Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into 'mas...Thong Kuah2019-06-101-0/+2
|\
| * Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ceMark Florian2019-06-061-0/+2
* | Merge branch 'docs-update-delete-user' into 'master'Evan Read2019-06-101-1/+1
|\ \
| * | 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 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 permissionsBen Bodenmiller2019-06-101-4/+5
|/ / /
* | | Merge branch 'sh-troubleshooting-openid-docs' into 'master'Evan Read2019-06-101-0/+23
|\ \ \
| * | | 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 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 guidelinesRussell Dickenson2019-06-091-10/+36
|/ / / /
* | | | Merge branch 'docs/ssot_subgroups' into 'master'Evan Read2019-06-091-19/+38
|\ \ \ \
| * | | | 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 requestsAchilleas Pipinellis2019-06-0914-94/+266
|/ / / /
* | | | Merge branch 'sh-revert-mr-24679' into 'master'Kamil Trzciński2019-06-096-501/+4
|\ \ \ \
| * | | | Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679Stan Hu2019-06-096-501/+4
|/ / / /
* | | | Merge branch 'sentry-raven_2.9' into 'master'Stan Hu2019-06-082-2/+2
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'docs/fix-example-dot-net'Mike Lewis2019-06-076958-130043/+325778
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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 notesAnnabel Dunstone Gray2019-06-072-3/+8
* | | | | | | Merge branch 'gt-externalize-profiles-preferences' into 'master'Phil Hughes2019-06-073-40/+46
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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' taskbw-gettext-rake-taskBrett Walker2019-06-071-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'docs-scoped-label-key' into 'master'Mike Lewis2019-06-071-0/+8
|\ \ \ \ \ \ \
| * | | | | | | 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 MRsee-9688-fe-mr-merge-orderSam Bigelow2019-06-056-15/+115
* | | | | | | | | Merge branch 'mh/board-models-ce' into 'master'Kushal Pandya2019-06-0712-30/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move Vue models from vue_shared to boardsMartin Hanzel2019-06-0712-30/+28
|/ / / / / / / / /
* | | | | | | | | Merge branch 'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-...Stan Hu2019-06-0711-8/+95
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137mfluharty2019-06-061-2/+2
| * | | | | | | | | Do not escape forward slashes in Maskable REGEXMatija Čupić2019-06-061-1/+1
| * | | | | | | | | Add frontend specsmfluharty2019-06-062-0/+67
| * | | | | | | | | Use exposed regex for frontend maskable checkmfluharty2019-06-065-5/+16