summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* First try at deferred renderingtz-experimental-mr-perf-imprTim Zallmann2018-07-175-2/+33
* Moved the CurrentUser Check to a simple boolean propTim Zallmann2018-07-1710-105/+95
* Fixed diff Line SpecTim Zallmann2018-07-171-1/+1
* Moved from diffFile to diffFileHashTim Zallmann2018-07-174-19/+19
* Inline DIff Table Rows removed diffFile AssignmentTim Zallmann2018-07-172-6/+13
* Exchanged diffFile Property with actually used propertiesTim Zallmann2018-07-174-10/+24
* Merge branch 'docs-merge-templates-updates' into 'master'Rémy Coutable2018-07-172-18/+18
|\
| * Merge Templates updatesMarcel Amirault2018-07-172-18/+18
|/
* Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into 'ma...Rémy Coutable2018-07-175-5/+53
|\
| * Merge cherry-pick modal specsGeorge Tsiolis2018-07-173-28/+21
| * Add spec for closing cherry-pick modal on escape keypressGeorge Tsiolis2018-07-174-4/+34
| * Add spec for closing revert modal on escape keypressGeorge Tsiolis2018-07-171-0/+25
| * Close revert and cherry-pick modal on escape keypressGeorge Tsiolis2018-07-171-1/+1
* | Merge branch 'ab-docs-find-or-create' into 'master'Yorick Peterse2018-07-171-0/+42
|\ \
| * | Document pattern for .find_or_create and similar methods.ab-docs-find-or-createAndreas Brandl2018-07-171-0/+42
* | | Merge branch 'dz-improve-manifest-doc' into 'master'Douwe Maan2018-07-171-1/+2
|\ \ \
| * | | Add small improvement to Manifest import feature docsdz-improve-manifest-docDmitriy Zaporozhets2018-07-161-1/+2
* | | | Merge branch 'move-danger-to-test-stage' into 'master'Sean McGivern2018-07-173-30/+38
|\ \ \ \
| * | | | Improve danger/specs/Dangerfile by not requiring new specs if specific labels...move-danger-to-test-stageRémy Coutable2018-07-171-4/+10
| * | | | Improve danger/changelog/Dangerfile to include the title in the bin/changelog...Rémy Coutable2018-07-171-7/+7
| * | | | Move the 'danger-review' job to the test stage and allow it to failRémy Coutable2018-07-171-19/+21
* | | | | Merge branch 'gitaly-issue-cross-reference' into 'master'Sean McGivern2018-07-171-0/+1
|\ \ \ \ \
| * | | | | Add cross-link to N+1 issueJacob Vosmaer2018-07-171-0/+1
* | | | | | Merge branch '14995-custom_wiki_sidebar' into 'master'Sean McGivern2018-07-177-8/+88
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | So we still want to have More Pages buttonLin Jen-Shin2018-07-171-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-16107-1711/+1678
| |\ \ \ \ \
| * | | | | | Always show More PagesLin Jen-Shin2018-07-131-4/+3
| * | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-131739-32484/+57035
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-c...Andreas Kämmerle2018-07-02448-4894/+7933
| |\ \ \ \ \ \ \
| * | | | | | | | There's no point to test customized sidebar with empty wikiLin Jen-Shin2018-06-271-10/+0
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-06-275423-90542/+176719
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-263-1/+24
| * | | | | | | | | Add some simple docs about _sidebar for wikiLin Jen-Shin2018-03-261-0/+7
| * | | | | | | | | Rearrange the tests and add another case whereLin Jen-Shin2018-03-261-15/+27
| * | | | | | | | | Avoid loading default sidebar if there's a customized oneLin Jen-Shin2018-03-261-2/+5
| * | | | | | | | | Add test for sidebar and cleanup wiki testsLin Jen-Shin2018-03-231-3/+38
| * | | | | | | | | Added support for custom wiki sidebar using _sidebar.md in the wiki root. If ...Joshua Sooter2018-03-233-5/+15
* | | | | | | | | | Merge branch 'gitaly-mandatory-20180716-jv' into 'master'Sean McGivern2018-07-172-73/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-172-73/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-1716-36/+132
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add changelog entry for emails delivery metricsfeature/gb/email-delivery-metricsGrzegorz Bizon2018-07-161-0/+5
| * | | | | | | | | Update notification specs after renaming a classGrzegorz Bizon2018-07-161-2/+4
| * | | | | | | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-163-2/+73
| * | | | | | | | | Register all action mailer interceptors in a single placeGrzegorz Bizon2018-07-164-7/+7
| * | | | | | | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-1611-31/+49
* | | | | | | | | | Merge branch '38095-change-api-docs-lookup-by-username' into 'master'Rémy Coutable2018-07-171-15/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update doc/api/users.mdDaniel Fernau2018-07-161-15/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2018-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Update pipelines.md to have correct curl commandsAlex Holland2018-07-161-2/+2
* | | | | | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-165-3/+48
|\ \ \ \ \ \ \ \ \ \