summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
| | | | | Update templates for 9.3 See merge request !12041
* Merge branch 'patch-24' into 'master'Sean McGivern2017-06-261-1/+1
|\ | | | | | | | | Update GITLAB_SHELL_VERSION to 5.0.6 See merge request !12450
| * Update GITLAB_SHELL_VERSION to 5.0.6Adam Niedzielski2017-06-261-1/+1
| |
* | Merge branch 'backport-renew-exclusive-lease' into 'master'Douwe Maan2017-06-262-1/+31
|\ \ | | | | | | | | | | | | Backport from EE: Introduce #renew for ExclusiveLease See merge request !12436
| * | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-leaseGabriel Mazetto2017-06-242-1/+31
| | |
* | | Merge branch 'backport-destroy-service-spec-fixes' into 'master'Douwe Maan2017-06-261-2/+3
|\ \ \ | | | | | | | | | | | | | | | | Backport from EE: Fixed DestroyService spec to actually test if removal was successful See merge request !12437
| * | | Fixed DestroyService spec to actually test if removal was successfulbackport-destroy-service-spec-fixesGabriel Mazetto2017-06-241-2/+3
| |/ /
* | | Merge branch 'doc_wiki_page_hook_actions' into 'master'Rémy Coutable2017-06-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Hint about the wiki page hook actions (doc) Closes #34242 See merge request !12427
| * | | Hint about the wiki page hook actions. Fixes #34242Diego de Souza Mendes2017-06-231-1/+1
| | | |
* | | | 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
| | | | | | | | | |
View Lorry Controller Status