summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Introduce email_recipients and use include? Feedback:Lin Jen-Shin2016-10-171-7/+9
* Prefix _ to show that it's intended unused, feedback:Lin Jen-Shin2016-10-171-1/+1
* Fix spelling, feedback:Lin Jen-Shin2016-10-171-1/+1
* Fix test by having a real commitLin Jen-Shin2016-10-171-1/+9
* Try to slightly optimize EmailHeleprsLin Jen-Shin2016-10-171-7/+11
* Update the other sites for reset_delivered_emails! as wellLin Jen-Shin2016-10-175-19/+19
* Use EmailHelpers where possible, feedback:Lin Jen-Shin2016-10-172-4/+7
* Prefer methods from EmailHelpers, feedback:Lin Jen-Shin2016-10-171-1/+1
* It no longer needs a block, feedback:Lin Jen-Shin2016-10-171-3/+1
* We're using BaseServiceLin Jen-Shin2016-10-171-1/+1
* How could I forget this?Lin Jen-Shin2016-10-171-1/+10
* Add test for sending pipeline notificationsLin Jen-Shin2016-10-171-0/+54
* Remove pusher support because it's covered by notificationsLin Jen-Shin2016-10-172-20/+2
* Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-171-0/+1
* recipients should be a list of emailsLin Jen-Shin2016-10-171-2/+2
* Revert "Revert this until we do notifications"Lin Jen-Shin2016-10-171-1/+1
* Revert "Split notification integration into another branch"Lin Jen-Shin2016-10-175-10/+31
* Add notification tests for itLin Jen-Shin2016-10-171-6/+61
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-17210-1295/+3322
|\
| * Merge branch 'fix-compare-spec' into 'master' Stan Hu2016-10-171-1/+1
| |\
| | * Fix broken rspec in compare textStan Hu2016-10-161-1/+1
| |/
| * Merge branch 'fix-spinach-compare-tests' into 'master' Stan Hu2016-10-174-10/+33
| |\
| | * Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-163-8/+23
| | * Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-162-7/+15
| |/
| * Merge branch 'dz-fix-branches-tab-test' into 'master' Dmitriy Zaporozhets2016-10-161-1/+1
| |\
| | * Fix active tab test for branches pagedz-fix-branches-tab-testDmitriy Zaporozhets2016-10-161-1/+1
| * | Merge branch 'fix-merge-request-diff-spinach-failures' into 'master' Dmitriy Zaporozhets2016-10-163-4/+12
| |\ \
| | * | Fix merge requests feature testsfix-merge-request-diff-spinach-failuresDmitriy Zaporozhets2016-10-161-1/+5
| | * | Wait for ajax call in merge request unsubscribe testDmitriy Zaporozhets2016-10-161-0/+2
| | * | Fix Spinach merge request diff failuresStan Hu2016-10-152-3/+5
| * | | Merge branch 'rs-changelog-markdown' into 'master' Robert Speicher2016-10-165-137/+267
| |\ \ \
| | * | | Convert CHANGELOG to MarkdownRobert Speicher2016-10-165-137/+267
| |/ / /
| * | | Merge branch 'docs/change-docs-reviewers' into 'master' Achilleas Pipinellis2016-10-161-5/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into 'docs/change-docs-reviewers'Achilleas Pipinellis2016-10-16225-1311/+3428
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dz-fix-group-milestone-creation' into 'master' Dmitriy Zaporozhets2016-10-161-4/+5
| |\ \ \
| | * | | Fix 500 error when creating mileston from group pagedz-fix-group-milestone-creationDmitriy Zaporozhets2016-10-161-4/+5
| |/ / /
| * | | Merge branch 'dz-fix-group-with-dot' into 'master' Dmitriy Zaporozhets2016-10-162-1/+10
| |\ \ \
| | * | | Fix 404 when group path has dot in the namedz-fix-group-with-dotDmitriy Zaporozhets2016-10-162-1/+10
| |/ / /
| * | | Merge branch '23353-add-bookclub-to-university' into 'master' Achilleas Pipinellis2016-10-163-0/+133
| |\ \ \
| | * | | Added book club to university23353-add-bookclub-to-universitySean Packham2016-10-143-0/+133
| * | | | Merge branch 'clarify-cache-and-artifact-paths' into 'master' Achilleas Pipinellis2016-10-161-3/+4
| |\ \ \ \
| | * | | | Document restrictions on cache and artifact pathsNick Thomas2016-10-141-3/+4
| * | | | | Merge branch 'sh-fix-ruby-2-1' into 'master' Stan Hu2016-10-161-2/+2
| |\ \ \ \ \
| | * | | | | Fix Hash syntax to work for both Ruby 2.1 and 2.3sh-fix-ruby-2-1Stan Hu2016-10-151-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix-broken-scss-lint' into 'master' Stan Hu2016-10-161-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
| |/ / / /
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-154-10/+18
| |\ \ \ \
| | * \ \ \ Merge branch 'dz-handle-unmatched-routes' into 'master' Dmitriy Zaporozhets2016-10-153-2/+9
| | |\ \ \ \
| | | * | | | Revert "Update git over http test to match new routing"dz-handle-unmatched-routesDmitriy Zaporozhets2016-10-151-2/+3
| | | * | | | Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-152-0/+6