summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adds tests to guarantee component is correctly updated33546-mini-pipelineFilipa Lacerda2017-06-261-0/+43
* Fix endpoint not being update correctlyFilipa Lacerda2017-06-261-2/+1
* Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-2627-84/+279
|\
| * fix spec failuresJames Lopez2017-06-252-4/+4
| * fix spec failuresJames Lopez2017-06-241-1/+1
| * fix spec failuresJames Lopez2017-06-231-4/+4
| * fix spec failuresJames Lopez2017-06-234-6/+4
| * update code based on feedbackJames Lopez2017-06-237-15/+14
| * fix bug in emails destroy serviceJames Lopez2017-06-232-3/+2
| * fix profiles specJames Lopez2017-06-231-3/+3
| * refactor update user service not to do auth checksJames Lopez2017-06-2317-68/+42
| * fix specsJames Lopez2017-06-232-4/+4
| * fix spec failuresJames Lopez2017-06-231-4/+6
| * more refactoringJames Lopez2017-06-236-31/+9
| * add missing action to blockJames Lopez2017-06-231-3/+3
| * more refactoring based on feedbackJames Lopez2017-06-2311-32/+39
| * refactor emails serviceJames Lopez2017-06-235-20/+14
| * add missing user updatesJames Lopez2017-06-231-3/+4
| * update missing email actionsJames Lopez2017-06-234-9/+7
| * fix specsJames Lopez2017-06-233-4/+4
| * update to use emails destroy serviceJames Lopez2017-06-235-6/+7
| * fixed specsJames Lopez2017-06-233-4/+6
| * add create and destroy services for emailsJames Lopez2017-06-233-0/+33
| * add more spec examplesJames Lopez2017-06-232-3/+23
| * add emails service specsJames Lopez2017-06-232-0/+35
| * added service in the rest of controllers and classesJames Lopez2017-06-237-12/+13
| * fix api and controller issuesJames Lopez2017-06-232-4/+9
| * fix specsJames Lopez2017-06-232-19/+8
| * update notification settings, fix api specsJames Lopez2017-06-234-6/+9
| * update preferences controllerJames Lopez2017-06-232-3/+6
| * updated emails, notifications and passwords controllerJames Lopez2017-06-233-12/+16
| * fix profiles controllerJames Lopez2017-06-231-2/+2
| * finish off refactoring users controllerJames Lopez2017-06-231-10/+25
| * update users controllerJames Lopez2017-06-231-2/+5
| * refactor profiles controller and update serviceJames Lopez2017-06-232-11/+12
| * update profiles controller to use new serviceJames Lopez2017-06-232-13/+21
| * use update service on ldap call and updated specs and serviceJames Lopez2017-06-233-6/+21
| * added bang option to specJames Lopez2017-06-231-0/+30
| * fix specJames Lopez2017-06-231-6/+5
| * ported EE user service to CEJames Lopez2017-06-235-2/+80
* | Merge branch 'replace_spinach_spec_profile_notifications.feature' into 'master'Rémy Coutable2017-06-263-15/+25
|\ \
| * | Replace 'profile/notifications.feature' spinach test with an rspec analogblackst0ne2017-06-223-15/+25
* | | Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into 'ma...Kamil Trzciński2017-06-265-11/+57
|\ \ \
| * | | Check warnings when building compound status SQL queryGrzegorz Bizon2017-06-203-17/+14
| * | | Fix specs for a concern that implements CI/CD statusesGrzegorz Bizon2017-06-201-1/+1
| * | | Add test for using overridden status method with scopesGrzegorz Bizon2017-06-201-0/+11
| * | | Add changelog entry for pipeline status fixGrzegorz Bizon2017-06-201-0/+4
| * | | Move custom compound status method to commit statusGrzegorz Bizon2017-06-203-3/+31
| * | | Fix pipeline status when allowed to fail jobs presentGrzegorz Bizon2017-06-202-1/+7
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-06-26222-2451/+5186
|\ \ \ \