Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 5.0.6 | Adam Niedzielski | 2017-06-26 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'backport-renew-exclusive-lease' into 'master' | Douwe Maan | 2017-06-26 | 2 | -1/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from EE: Introduce #renew for ExclusiveLease See merge request !12436 | |||||
| * | | | | | | | | | | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-lease | Gabriel Mazetto | 2017-06-24 | 2 | -1/+31 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'backport-destroy-service-spec-fixes' into 'master' | Douwe Maan | 2017-06-26 | 1 | -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-fixes | Gabriel Mazetto | 2017-06-24 | 1 | -2/+3 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'doc_wiki_page_hook_actions' into 'master' | Rémy Coutable | 2017-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hint about the wiki page hook actions (doc) Closes #34242 See merge request !12427 | |||||
| * | | | | | | | | | | | Hint about the wiki page hook actions. Fixes #34242 | Diego de Souza Mendes | 2017-06-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '34207-remove-bin-ci-upgrade-rb' into 'master' | Rémy Coutable | 2017-06-26 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bin/ci/upgrade.rb Closes #34207 See merge request !12414 | |||||
| * | | | | | | | | | | | | Remove bin/ci/upgrade.rb as not working all | Takuya Noguchi | 2017-06-24 | 2 | -3/+4 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch '34302-update-test' into 'master' | Phil Hughes | 2017-06-26 | 1 | -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-test | Filipa Lacerda | 2017-06-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead | |||||
* | | | | | | | | | | | | | | Merge branch '34289-drop-gfm-on-milestone-issuable-title' into 'master' | Sean McGivern | 2017-06-26 | 2 | -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 performance | Takuya Noguchi | 2017-06-26 | 2 | -1/+5 | |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'docs-examples-deployment-composer-npm' into 'master' | Rémy Coutable | 2017-06-26 | 1 | -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 practice | Gabriele | 2017-06-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | | | | | | | | Merge branch 'sh-revert-annotate-for-blame' into 'master' | Rémy Coutable | 2017-06-26 | 6 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401 | |||||
| * | | | | | | | | | | | | | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blame | Stan Hu | 2017-06-22 | 7 | -10/+5 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'winh-karma-suppress-vue-tips' into 'master' | Clement Ho | 2017-06-26 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress Vue tips when running Karma See merge request !12379 | |||||
| * | | | | | | | | | | | | | | | Suppress Vue tips when running Karmawinh-karma-suppress-vue-tips | winh | 2017-06-22 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'feature/add-new-services' into 'master' | Sean McGivern | 2017-06-26 | 27 | -84/+279 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125 | |||||
| * | | | | | | | | | | | | | | | | fix spec failures | James Lopez | 2017-06-25 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix spec failures | James Lopez | 2017-06-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix spec failures | James Lopez | 2017-06-23 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix spec failures | James Lopez | 2017-06-23 | 4 | -6/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update code based on feedback | James Lopez | 2017-06-23 | 7 | -15/+14 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix bug in emails destroy service | James Lopez | 2017-06-23 | 2 | -3/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix profiles spec | James Lopez | 2017-06-23 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | refactor update user service not to do auth checks | James Lopez | 2017-06-23 | 17 | -68/+42 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix specs | James Lopez | 2017-06-23 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix spec failures | James Lopez | 2017-06-23 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | more refactoring | James Lopez | 2017-06-23 | 6 | -31/+9 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add missing action to block | James Lopez | 2017-06-23 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | more refactoring based on feedback | James Lopez | 2017-06-23 | 11 | -32/+39 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | refactor emails service | James Lopez | 2017-06-23 | 5 | -20/+14 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add missing user updates | James Lopez | 2017-06-23 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update missing email actions | James Lopez | 2017-06-23 | 4 | -9/+7 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix specs | James Lopez | 2017-06-23 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update to use emails destroy service | James Lopez | 2017-06-23 | 5 | -6/+7 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fixed specs | James Lopez | 2017-06-23 | 3 | -4/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add create and destroy services for emails | James Lopez | 2017-06-23 | 3 | -0/+33 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add more spec examples | James Lopez | 2017-06-23 | 2 | -3/+23 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | add emails service specs | James Lopez | 2017-06-23 | 2 | -0/+35 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | added service in the rest of controllers and classes | James Lopez | 2017-06-23 | 7 | -12/+13 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix api and controller issues | James Lopez | 2017-06-23 | 2 | -4/+9 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix specs | James Lopez | 2017-06-23 | 2 | -19/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update notification settings, fix api specs | James Lopez | 2017-06-23 | 4 | -6/+9 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update preferences controller | James Lopez | 2017-06-23 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | updated emails, notifications and passwords controller | James Lopez | 2017-06-23 | 3 | -12/+16 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix profiles controller | James Lopez | 2017-06-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | finish off refactoring users controller | James Lopez | 2017-06-23 | 1 | -10/+25 | |
| | | | | | | | | | | | | | | | | |