summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'issue-inline-edit-quick-submit' into 'master'Filipa Lacerda2017-06-266-2/+58
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixes ctrl+enter not submit issue edit formissue-inline-edit-quick-submitPhil Hughes2017-06-246-2/+58
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'grpc-1.4' into 'master'Sean McGivern2017-06-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use grpc 1.4.0Jacob Vosmaer2017-06-231-1/+1
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-269-33/+35
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove last references to job for pipeline chartszj-faster-charts-pageZ.J. van de Weg2017-06-261-3/+3
| | * | | | | | | | | | | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-237-17/+17
| | * | | | | | | | | | | Improve performance for pipeline chartsZ.J. van de Weg2017-06-235-19/+21
| * | | | | | | | | | | | Merge branch 'dm-group-page-name' into 'master'Sean McGivern2017-06-264-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Show group name instead of path on group pagedm-group-page-nameDouwe Maan2017-06-234-6/+10
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'fix-34019' into 'master'Sean McGivern2017-06-262-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check if repository exists before performing housekeepingfix-34019Douglas Barbosa Alexandre2017-06-231-0/+2
| | * | | | | | | | | | | | Break Project#perform_housekeeping in two methodsDouglas Barbosa Alexandre2017-06-231-4/+12
| | * | | | | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-06-231-0/+4
| | * | | | | | | | | | | | Perform project housekeeping after importing projectsDouglas Barbosa Alexandre2017-06-231-3/+8
| * | | | | | | | | | | | | Merge branch '33223-multiple-tooltips-on-the-same-vue-component' into 'master'Phil Hughes2017-06-2630-123/+251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add support for multiple tooltips in the same Vue componentEric Eastwood2017-06-2330-123/+251
| * | | | | | | | | | | | | Merge branch '34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-...Marcia Ramos2017-06-242-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Replace 'Settings ➔ CI/CD Pipelines' with 'Settings ➔ Pipelines' in docs34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-in-docsbikebilly2017-06-232-4/+4
| * | | | | | | | | | | | | | Merge branch 'fix-profile-show-interpolation' into 'master'Phil Hughes2017-06-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix interpolation in app/views/profile/show.html/hamlNick Thomas2017-06-241-1/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Monty's version is better.sytses2017-06-231-1/+1
| * | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cesytses2017-06-23196-2504/+5238
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dm-requirements-txt-tilde' into 'master'Grzegorz Bizon2017-06-233-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Don't match tilde and exclamation mark as part of requirements.txt package namedm-requirements-txt-tildeDouwe Maan2017-06-233-1/+10
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'Douwe Maan2017-06-237-6/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-237-6/+30
| | * | | | | | | | | | | | | Merge branch 'mk-fix-breadcrumb-order-33938' into 'master'Douwe Maan2017-06-233-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Add changelog entrymk-fix-breadcrumb-order-33938Michael Kozono2017-06-231-0/+4
| | | * | | | | | | | | | | | | Fix breadcrumb orderMichael Kozono2017-06-222-1/+14
| | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'mk-fix-issue-34068' into 'master'Douwe Maan2017-06-232-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |