summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix environment_metrics speccherry-pick-5ea675beJose Ivan Vargas2017-06-261-1/+1
|
* Merge branch 'additional-metrics-dashboard' into ↵Phil Hughes2017-06-2630-1984/+6119
| | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* Merge branch '34207-remove-bin-ci-upgrade-rb' into 'master'Rémy Coutable2017-06-262-3/+4
|\ | | | | | | | | | | | | Remove bin/ci/upgrade.rb Closes #34207 See merge request !12414
| * Remove bin/ci/upgrade.rb as not working allTakuya Noguchi2017-06-242-3/+4
| |
* | Merge branch '34302-update-test' into 'master'Phil Hughes2017-06-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix click not being able to find the current element to use trigger('click') instead Closes #34302 See merge request !12447
| * | Fix click not being able to find the current element to use trigger('click') ↵34302-update-testFilipa Lacerda2017-06-261-1/+1
| | | | | | | | | | | | instead
* | | Merge branch '34289-drop-gfm-on-milestone-issuable-title' into 'master'Sean McGivern2017-06-262-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop GFM support for issuable title on milestone Closes #34289 See merge request !12444
| * | | Drop GFM support for issuable title on milestone for consistency and performanceTakuya Noguchi2017-06-262-1/+5
| | | |
* | | | Merge branch 'docs-examples-deployment-composer-npm' into 'master'Rémy Coutable2017-06-261-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change composer update to install to follow PHP/composer best practice See merge request !12400
| * | | | Change composer update to install to follow PHP/composer best practiceGabriele2017-06-221-3/+3
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'sh-revert-annotate-for-blame' into 'master'Rémy Coutable2017-06-266-6/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401
| * | | | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blameStan Hu2017-06-227-10/+5
| | | | | |
* | | | | | Merge branch 'winh-karma-suppress-vue-tips' into 'master'Clement Ho2017-06-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress Vue tips when running Karma See merge request !12379
| * | | | | | Suppress Vue tips when running Karmawinh-karma-suppress-vue-tipswinh2017-06-221-0/+4
| | | | | | |
* | | | | | | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-2627-84/+279
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125
| * | | | | | | 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
| | | | | | | |
View Lorry Controller Status