summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Simplify WikiPage#hook_attrs specSean McGivern2018-07-171-6/+4
| * | | | | | | | Clarify web hook image rewriting doc exampleSean McGivern2018-07-171-2/+2
| * | | | | | | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| * | | | | | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-061929-33482/+64436
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-067-32/+139
| * | | | | | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-2010-45/+95
| * | | | | | | | | Fix hook data specsSean McGivern2018-06-204-11/+12
| * | | | | | | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| * | | | | | | | | Removing the empty line at the class body beginningSatish Perala2018-06-201-1/+0
| * | | | | | | | | Checking for the presense of markdown textSatish Perala2018-06-201-1/+5
| * | | | | | | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-209-2/+53
* | | | | | | | | | Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' int...Fatih Acet2018-07-1718-145/+170
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "MR: Reduce the memory footprint of the component tree"Tim Zallmann2018-07-1718-145/+170
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-merge-request-header-branch-details-right-margin' into 'mas...Annabel Gray2018-07-172-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add merge request header branch actions left marginGeorge Tsiolis2018-07-172-0/+6
* | | | | | | | | | | Merge branch '49165-pipeline-graph-in-new-merge-request-widget-is-flickering'...Annabel Gray2018-07-172-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix MR widget ci status icon tooltip flicker49165-pipeline-graph-in-new-merge-request-widget-is-flickeringClement Ho2018-07-162-1/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'person-tags-better' into 'master'Annabel Gray2018-07-172-7/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Highlighting of person mentions now better visible on low contrast screens an...Dimitrie Hoekstra2018-07-172-7/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'zj-remove-sanitize-repo-path' into 'master'Sean McGivern2018-07-173-42/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove sanitize_repo_pathZeger-Jan van de Weg2018-07-173-42/+1
* | | | | | | | | | | | Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master'44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summaryRémy Coutable2018-07-178-2/+197
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QA scenario to add/edit/delete a file via the Web UISanad Liaquat2018-07-178-2/+197
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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