summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-doc-update' into 'master'Rémy Coutable2018-10-182-3/+3
|\
| * [ci skip] Update Gitaly installation documentationAlejandro Rodríguez2018-10-172-3/+3
* | Merge branch 'sh-strip-github-pat-whitespace' into 'master'Rémy Coutable2018-10-183-1/+18
|\ \
| * | Strip whitespace around GitHub personal access tokensStan Hu2018-10-173-1/+18
* | | Merge branch 'dm-document-role-maintainer' into 'master'Grzegorz Bizon2018-10-181-40/+88
|\ \ \
| * | | Strongly recommend involving a domain expert, especially when in doubt.Douwe Maan2018-10-171-4/+8
| * | | Merge branch 'master' into 'dm-document-role-maintainer'Douwe Maan2018-10-16816-8387/+13611
| |\ \ \
| * | | | Clarify responsibilities of MR author and maintainer based on feedback.Douwe Maan2018-10-161-40/+51
| * | | | Rewrite guidance on getting your merge request reviewed, approved, and mergedDouwe Maan2018-10-101-36/+32
| * | | | Document the role of the maintainerDouwe Maan2018-10-091-16/+53
* | | | | Merge branch '52838-broken-master-jasmine-new-line-before-expect-in-eslint' i...Clement Ho2018-10-170-0/+0
|\ \ \ \ \
| * | | | | Fix violation of jasmine/new-line-before-expectMike Greiling2018-10-171-0/+2
* | | | | | Merge branch 'prettify-all-the-karma-specs' into 'master'Clement Ho2018-10-17286-5214/+5827
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into 'prettify-all-the-karma-specs'Mike Greiling2018-10-1765-450/+132064
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-...Mike Greiling2018-10-173-151/+186
|\ \ \ \ \ \
| * | | | | | Add missing state on the application row componentJose Vargas2018-10-173-151/+186
* | | | | | | Merge branch 'git-doc-fix' into 'master'Douwe Maan2018-10-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flagsAlejandro Rodríguez2018-10-171-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ee-7944-fix-resolve-checkbox-text-color' into 'master'Clement Ho2018-10-171-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Backport from EE: set color on note-form-actionsAndré Luís2018-10-171-0/+2
* | | | | | | Merge branch 'qa-123' into 'master'Douglas Barbosa Alexandre2018-10-1734-205/+1246
|\ \ \ \ \ \ \
| * | | | | | | First iteration to allow creating QA resources using the APIRémy Coutable2018-10-1734-205/+1246
|/ / / / / / /
* | | | | | | Merge branch '52527-harden-wiki-against-missing-last-version' into 'master'Douglas Barbosa Alexandre2018-10-175-14/+33
|\ \ \ \ \ \ \
| * | | | | | | Harden the wiki against missing last_versionsNick Thomas2018-10-175-14/+33
* | | | | | | | Merge branch 'gt-remove-prometheus-configuration-help-text' into 'master'Clement Ho2018-10-173-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove prometheus configuration help textGeorge Tsiolis2018-10-173-4/+5
* | | | | | | | | Merge branch '49591-use-cached-readme-blobs' into 'master'Rémy Coutable2018-10-175-38/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use cached readme blobs where appropriateNick Thomas2018-10-175-38/+79
* | | | | | | | | | Merge branch 'fj-52406-wiki-file-content-disposition' into 'master'Douwe Maan2018-10-1712-46/+130528
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-1712-46/+130528
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'severity-and-priority-rounding-rules-docs' into 'master'Douwe Maan2018-10-171-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Round P/S labels up, not downNick Thomas2018-10-171-0/+7
| | | | | | | * | | | Resolve eslint violationsMike Greiling2018-10-1731-40/+86
| | | | | | | * | | | Remove superfluous IIFEsMike Greiling2018-10-173-256/+250
| | | | | | | * | | | Prettify all spec filesMike Greiling2018-10-17285-4687/+5295
| | | | | | | * | | | Prettify awards_handler_spec.js scriptMike Greiling2018-10-171-356/+335
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'patch-28' into 'master'52748-gitlab-maven-repository-documentation-improvementsMike Lewis2018-10-171-7/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | further instance statistics editsMike Lewis2018-10-171-8/+8
| * | | | | | | | | spellingWilliam Chia2018-10-031-1/+1
| * | | | | | | | | add link to concurrent devopsWilliam Chia2018-10-031-1/+2
* | | | | | | | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-178-118/+296
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-162-14/+57
| * | | | | | | | | | Remove explicit requires from flowdockNick Thomas2018-10-162-5/+0
| * | | | | | | | | | Remove a dependency on gitlab-gollum-libNick Thomas2018-10-164-54/+33
| * | | | | | | | | | Merge flowdock monkeypatch into the inlined gemNick Thomas2018-10-163-101/+23
| * | | | | | | | | | Rubocop improvementsNick Thomas2018-10-162-29/+30
| * | | | | | | | | | Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-166-12/+250
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceGitLab Release Tools Bot2018-10-1722-32/+274
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'extend-create-spec-with-label' into 'master'Rémy Coutable2018-10-1714-12/+150
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Extend Create New Merge Request test to also add a labelAleksandr Soborov2018-10-1714-12/+150
| |/ / / / / / / / / /