summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix editing notes on MR diffs tabmr-notes-no-cookieSimon Knox2018-02-222-13/+2
* remove duplicate #notes element that broke specsSimon Knox2018-02-225-6/+13
* Merge branch 'acet-mr-notes-index' into mr-notes-no-cookieSimon Knox2018-02-21543-6529/+6049
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-i...Simon Knox2018-02-21543-6529/+6049
| |\
| | * Merge branch 'jquery3' into 'master'Jacob Schatz2018-02-2074-238/+1106
| | |\
| | | * Update to jQuery 3.Jacob Schatz2018-02-2074-238/+1106
| | |/
| | * Merge branch 'issue-index-refactor' into 'master'Clement Ho2018-02-202-1/+11
| | |\
| | | * Refactor issue index filtered searchissue-index-refactorJacob Schatz2018-02-122-1/+11
| | * | Merge branch 'refactor-jobs-show-haml' into 'master'Jacob Schatz2018-02-204-8/+5
| | |\ \
| | | * | Remove export from pagesrefactor-jobs-show-hamlClement Ho2018-02-161-1/+1
| | | * | Merge branch 'master' into 'refactor-jobs-show-haml'Clement Ho2018-02-16126-635/+1223
| | | |\ \
| | | * | | Add dispatcher imports for job details bundleClement Ho2018-02-155-9/+11
| | * | | | Merge branch 'docs-no-js' into 'master'Tim Zallmann2018-02-201-0/+3
| | |\ \ \ \
| | | * | | | Add excerpt about not supporting GitLab running without JavascriptClement Ho2018-02-201-0/+3
| | |/ / / /
| | * | | | Merge branch 'update-prometheus-10-5-docs' into 'master'Marcia Ramos2018-02-208-209/+63
| | |\ \ \ \
| | | * | | | One last item of feedbackJoshua Lambert2018-02-201-1/+1
| | | * | | | FeedbackJoshua Lambert2018-02-204-3/+14
| | | * | | | Update NGINX docsupdate-prometheus-10-5-docsJoshua Lambert2018-02-201-8/+7
| | | * | | | Minor polishJoshua Lambert2018-02-202-6/+4
| | | * | | | Fix linksJoshua Lambert2018-02-202-6/+6
| | | * | | | Update Prometheus docs for enhanced integrationJoshua Lambert2018-02-205-199/+45
| | * | | | | Merge branch 'remove-notes-bundle' into 'master'Clement Ho2018-02-203-11/+4
| | |\ \ \ \ \
| | | * | | | | Remove "notes" bundle from webpack configMike Greiling2018-02-203-11/+4
| | |/ / / / /
| | * | | | | Merge branch 'dispatcher-mr-haml' into 'master'Jacob Schatz2018-02-207-26/+23
| | |\ \ \ \ \
| | | * | | | | Remove import so that webpack can handle the moduledispatcher-mr-hamlClement Ho2018-02-191-3/+0
| | | * | | | | Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-1989-438/+591
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-1619-64/+98
| | | |\ \ \ \ \ \
| | | * | | | | | | Wrap pages in DOMContentLoadedClement Ho2018-02-161-2/+2
| | | * | | | | | | Re-add common_vueClement Ho2018-02-161-0/+2
| | | * | | | | | | Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-1680-364/+1075
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Add dispatcher imports for bundles used in merge request show pathClement Ho2018-02-156-24/+22
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'docs-link-to-custom-issue-tracker' into 'master'Sean McGivern2018-02-201-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update custom_issue_tracker.mddocs-link-to-custom-issue-trackerVictor Wu2018-02-201-0/+2
| | * | | | | | | | | Merge branch 'zj-unit-test-gitaly-arrays' into 'master'Sean McGivern2018-02-202-0/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add unit tests for Gitaly typeszj-unit-test-gitaly-arraysZeger-Jan van de Weg2018-02-202-0/+5
| | * | | | | | | | | | Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master'Robert Speicher2018-02-202-4/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Generate EE changelog under ee/changelogs/unreleased/Rémy Coutable2018-02-202-4/+5
| | * | | | | | | | | | | Merge branch 'revert-828357fb' into 'master'Douwe Maan2018-02-201-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Revert "Merge branch 'zj-n-1-root-show' into 'master'"Zeger-Jan van de Weg2018-02-201-1/+4
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'fix-diff-flash' into 'master'Clement Ho2018-02-201-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | only show error if there is an errorfix-diff-flashSimon Knox2018-02-201-1/+3
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'docs-comm-article-phoenix-app-gitlab-ci' into 'master'Marcia Ramos2018-02-209-55/+428
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Docs: comm article Phoenix App with GitLab CI/CDMarcia Ramos2018-02-209-55/+428
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch 'docs-pages-refactor-article-series' into 'master'Achilleas Pipinellis2018-02-206-97/+53
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Docs: Pages - clean up articlesMarcia Ramos2018-02-206-97/+53
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-201-2/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Only use features for eventsPawel Chojnacki2018-02-201-3/+3
| | | * | | | | | | | | Put all event metrics exposed to prometheus behind a feature flagPawel Chojnacki2018-02-201-0/+1
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '43376-follow-up-from-docs-update-all-articles-with-the-new-layo...Achilleas Pipinellis2018-02-201-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | specify date format43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatterMarcia Ramos2018-02-191-2/+2