Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' | Sean McGivern | 2016-10-28 | 11 | -8/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | add "x of y tasks completed" on issuable | Guilherme Salazar | 2016-10-28 | 11 | -8/+42 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'fix-8-13-changelog-gh-import' into 'master' | Rémy Coutable | 2016-10-28 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix CHANGELOG for GH import fixesfix-8-13-changelog-gh-import | Sean McGivern | 2016-10-28 | 1 | -3/+3 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'ee-1159-allow-permission-check-bypass-in-approve-access-request... | Stan Hu | 2016-10-28 | 2 | -11/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Allow Members::ApproveAccessRequestService to accept a new :force paramee-1159-allow-permission-check-bypass-in-approve-access-request-service | Rémy Coutable | 2016-10-28 | 2 | -11/+73 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-a... | Rémy Coutable | 2016-10-28 | 2 | -8/+195 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add specs for a user from a group link23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issue | Sean McGivern | 2016-10-28 | 1 | -0/+30 | |
| * | | | | | | | | | Fix project member access for group links | Sean McGivern | 2016-10-28 | 2 | -8/+165 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'adam-fix-labels-find-or-create' into 'master' | Douwe Maan | 2016-10-28 | 10 | -46/+70 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-create | Adam Niedzielski | 2016-10-28 | 10 | -46/+70 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'use-optimistic-locking' into 'master' | Stan Hu | 2016-10-28 | 14 | -49/+122 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make retry_lock to not be infiniteuse-optimistic-locking | Kamil Trzcinski | 2016-10-27 | 3 | -5/+20 | |
| * | | | | | | | | Fix Rubocop unused variables warning | Stan Hu | 2016-10-26 | 1 | -2/+2 | |
| * | | | | | | | | Remove puts to solve Rubocop errors | Stan Hu | 2016-10-26 | 1 | -2/+0 | |
| * | | | | | | | | Fix duration specs | Kamil Trzcinski | 2016-10-26 | 1 | -14/+7 | |
| * | | | | | | | | Fix optimistic locking | Kamil Trzcinski | 2016-10-26 | 7 | -16/+27 | |
| * | | | | | | | | Add tests for optimistic locking | Kamil Trzcinski | 2016-10-26 | 5 | -7/+38 | |
| * | | | | | | | | Use optimistic locking | Kamil Trzcinski | 2016-10-26 | 6 | -25/+50 | |
* | | | | | | | | | Merge branch 'issue-board-welcome-cookie-monster' into 'master' | Robert Speicher | 2016-10-28 | 4 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Fixed boards store specissue-board-welcome-cookie-monster | Phil Hughes | 2016-10-28 | 2 | -3/+5 | |
| * | | | | | | | | Delete issue board welcome cookie when project is new | Phil Hughes | 2016-10-28 | 3 | -2/+7 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'clean-up-issue_spec.js' into 'master' | Rémy Coutable | 2016-10-28 | 10 | -95/+244 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Document how to run frontend tests | Winnie | 2016-10-28 | 1 | -0/+14 | |
| * | | | | | | | Replace static issue fixtures by script (!6059) | winniehell | 2016-10-28 | 9 | -42/+134 | |
| * | | | | | | | Clean up issue_spec.js | winniehell | 2016-10-28 | 1 | -59/+102 | |
* | | | | | | | | Merge branch 'fix/make-github-import-retryable' into 'master' | Sean McGivern | 2016-10-28 | 12 | -27/+120 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix typosfix/make-github-import-retryable | Ahmad Sherif | 2016-10-28 | 2 | -2/+2 | |
| * | | | | | | | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importer | Ahmad Sherif | 2016-10-28 | 1 | -50/+34 | |
| * | | | | | | | | Use public_send instead of send | Ahmad Sherif | 2016-10-28 | 1 | -1/+1 | |
| * | | | | | | | | Modify GitHub importer to be retryable | Ahmad Sherif | 2016-10-28 | 9 | -27/+136 | |
| * | | | | | | | | Check if repository already exists before trying to re-import it | Ahmad Sherif | 2016-10-28 | 2 | -2/+2 | |
* | | | | | | | | | Merge branch '5905-duplicate-email-errors' into 'master' | Rémy Coutable | 2016-10-28 | 3 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into 5905-duplicate-email-errors | Steve Halasz | 2016-10-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 5905-duplicate-email-errors | Steve Halasz | 2016-10-27 | 401 | -873/+3487 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add changelog entry | Steve Halasz | 2016-10-27 | 1 | -0/+1 | |
| * | | | | | | | | | | | Only show one error message for an invalid email | Steve Halasz | 2016-10-27 | 2 | -1/+14 | |
* | | | | | | | | | | | | Merge branch 'bugfix/dragging_milestones' into 'master' | Sean McGivern | 2016-10-28 | 4 | -2/+90 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'bugfix/dragging_milestones' of gitlab.com:blackst0ne/gitlab-ce ... | blackst0ne | 2016-10-28 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Stop unauthorized users dragging on milestone page | blackst0ne | 2016-10-28 | 4 | -2/+90 | |
| * | | | | | | | | | | | | Stop unauthorized users dragging on milestone page | blackst0ne | 2016-10-28 | 4 | -2/+90 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'deploykeys-api-doc' into 'master' | Rémy Coutable | 2016-10-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Document admin access requirement for /deploy_keys endpoint | winniehell | 2016-10-28 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master' | Rémy Coutable | 2016-10-28 | 5 | -52/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-bugged | Alejandro Rodríguez | 2016-10-27 | 5 | -52/+102 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '23890-api-should-accepts-boolean' into 'master' | Sean McGivern | 2016-10-28 | 3 | -11/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-boolean | Rémy Coutable | 2016-10-27 | 3 | -11/+20 | |
* | | | | | | | | | | | | | Merge branch 'issue_1008_1' into 'master' | Sean McGivern | 2016-10-28 | 44 | -499/+516 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Upgrade jira-ruby gem versionissue_1008_1 | Felipe Artur | 2016-10-26 | 3 | -4/+4 | |
| * | | | | | | | | | | | | | Finish updates to use JIRA gem | Felipe Artur | 2016-10-26 | 43 | -542/+391 |