summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-testRémy Coutable2018-11-121-3/+3
|\
| * Fix transient rspec issueJan Provaznik2018-11-121-3/+3
* | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-1215-242/+374
|\ \
| * | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-102-6/+2
| * | Refactor specsblackst0ne2018-11-074-469/+253
| * | DRY specs, fix typos in docsblackst0ne2018-11-065-45/+35
| * | Update documentation after documentation review.blackst0ne2018-11-051-2/+2
| * | Updated docs and removed redundant screenshotblackst0ne2018-11-052-2/+2
| * | Update docs after docs reviewblackst0ne2018-11-051-14/+13
| * | Update Gemfileblackst0ne2018-11-053-17/+7
| * | Fix frozen stringsblackst0ne2018-11-051-0/+2
| * | Update documentationblackst0ne2018-11-053-0/+31
| * | Add spec for DiscordServiceblackst0ne2018-11-051-0/+242
| * | Update discord notification serviceblackst0ne2018-11-051-6/+4
| * | Add changelog entryblackst0ne2018-11-051-0/+5
| * | Add Discord integrationblackst0ne2018-10-309-0/+95
* | | Merge branch 'disable-usage-ping-review-apps' into 'master'Rémy Coutable2018-11-121-0/+1
|\ \ \
| * | | Disable usage pings in review appsdisable-usage-ping-review-appsBalasankar "Balu" C2018-11-111-0/+1
* | | | Merge branch '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-githu...Sean McGivern2018-11-123-5/+5
|\ \ \ \
| * | | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markupAlejandro Rodríguez2018-11-113-5/+5
| |/ / /
* | | | Merge branch 'docs/more-url-fixes' into 'master'Dmitriy Zaporozhets2018-11-123-27/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix some links and Markdowndocs/more-url-fixesEvan Read2018-11-123-27/+23
* | | | Merge branch 'docs/fix-more-urls' into 'master'Achilleas Pipinellis2018-11-124-6/+6
|\ \ \ \
| * | | | Implement review commentsdocs/fix-more-urlsEvan Read2018-11-122-4/+4
| * | | | Update URLs to better onesEvan Read2018-11-094-4/+4
* | | | | Merge branch 'docs/fix-helm-chart-issue-link' into 'master'Achilleas Pipinellis2018-11-121-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix link for raising helm chart issuesdocs/fix-helm-chart-issue-linkEvan Read2018-11-121-2/+2
* | | | | Merge branch 'add-rbac-link-in-k8s-docs' into 'master'Evan Read2018-11-121-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add link in K8s integration docs to RBAC rolesadd-rbac-link-in-k8s-docsDylan Griffith2018-11-091-3/+4
* | | | | Merge branch 'docs-update-variable-naming' into 'master'Evan Read2018-11-1111-18/+18
|\ \ \ \ \
| * | | | | Docs: Update Variable namingMarcel Amirault2018-11-1111-18/+18
|/ / / / /
* | | | | Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-114-3/+20
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add changelog for fixing k8s integration error handlingfix-error-handling-bugs-in-kubernetes-integrationThong Kuah2018-11-091-0/+5
| * | | | Fix error handling in cluster_platform_configure_workerDylan Griffith2018-11-092-1/+15
| * | | | Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
| |/ / /
* | | | Merge branch '51259-ci-cd-gitlab-ui-1' into 'master'Clement Ho2018-11-098-68/+96
|\ \ \ \
| * | | | Use gitlab-ui in jobs and pipelinesFilipa Lacerda2018-11-098-68/+96
|/ / / /
* | | | Merge branch 'sh-redact-links-remove-circular-dependency-ce' into 'master'Douglas Barbosa Alexandre2018-11-092-17/+27
|\ \ \ \
| * | | | Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
* | | | | Merge branch '48475-gitlab-pages-settings-regressions' into 'master'Annabel Dunstone Gray2018-11-094-13/+17
|\ \ \ \ \
| * | | | | Resolve "GitLab Pages settings regressions"Scott Hampton2018-11-094-13/+17
|/ / / / /
* | | | | Merge branch '51259-gitlab-ui-replacement' into 'master'Clement Ho2018-11-092-14/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-092-14/+6
* | | | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
|\ \ \ \ \
| * | | | | Fix alignment of diff comment buttons53768-diff-comment-action-btnsAnnabel Dunstone Gray2018-11-092-4/+3
* | | | | | Merge branch 'sh-fix-dashboard-helper-constant' into 'master'Douglas Barbosa Alexandre2018-11-091-1/+1
|\ \ \ \ \ \
| * | | | | | Fix DashboardHelper reference in specStan Hu2018-11-091-1/+1
|/ / / / / /
* | | | | | Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-092-3/+10
|\ \ \ \ \ \
| * | | | | | Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-092-3/+10
* | | | | | | Merge branch 'frozen-string-lib-gitlab-more' into 'master'Rémy Coutable2018-11-09102-5/+214
|\ \ \ \ \ \ \