summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-i18n' into 'master'12-1-auto-deploy-0010522Bob Van Landuyt2019-06-1445-12197/+126134
* Merge branch 'master-i18n' into 'master'Stan Hu2019-06-144-3504/+14577
* Merge branch 'fix-flyout-navs' into 'master'Phil Hughes2019-06-145-3/+45
* Merge branch 'rc/add_back_sidekiq_exporter' into 'master'Stan Hu2019-06-141-0/+6
* Merge branch 'sh-speed-up-commit-loading' into 'master'Douglas Barbosa Alexandre2019-06-133-1/+14
* Merge branch 'ci-variables-complex-expression-default-disabled' into 'master'Stan Hu2019-06-134-4/+4
* Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'Sean McGivern2019-06-135-12/+1
* Merge branch 'upgrade-pages-to-v1.6.1' into 'master'Nick Thomas2019-06-122-1/+6
* Merge branch 'fix-diverged-branch-locals' into 'master'Stan Hu2019-06-122-1/+6
* Merge branch 'revert-28513' into 'master'Douwe Maan2019-06-1214-381/+223
* Merge branch 'fix-pipeline-schedule-owner-is-nil' into 'master'Stan Hu2019-06-123-1/+14
* Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'Dmitriy Zaporozhets2019-06-123-4/+28
* Merge branch 'osw-avoid-encoding-errors-on-merge-to-ref-service' into 'master'Robert Speicher2019-06-103-1/+24
* Merge branch 'osw-fix-post-dep-migration-with-timeout' into 'master'Stan Hu2019-06-103-12/+15
* Merge branch 'ac-63020-typeerror-nil-can-t-be-coerced-into-integer' into 'mas...Mayra Cabrera2019-06-103-1/+18
* Merge branch 'sh-revert-50070-ad-fix' into '12-1-auto-deploy-0010522'Marin Jankovski2019-06-106-501/+4
|\
| * Merge branch 'sh-revert-mr-24679' into 'master'sh-revert-50070-ad-fixKamil Trzciński2019-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
| * | | | | | Add CHANGELOG entryMatija Čupić2019-06-061-0/+5
| * | | | | | Expose javascript regexMatija Čupić2019-06-062-2/+5
| * | | | | | Allow masking if 8 or more characters in base64Thomas Nilsson2019-06-063-3/+4
* | | | | | | Merge branch 'fix-legacy-uploads-spec' into 'master'Sean McGivern2019-06-071-9/+25
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix migration specs using factoriesMarkus Koller2019-06-071-9/+25
|/ / / / / /