summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-2818-87/+161
* Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-a...Rémy Coutable2016-10-282-8/+195
|\
| * Add specs for a user from a group link23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issueSean McGivern2016-10-281-0/+30
| * Fix project member access for group linksSean McGivern2016-10-282-8/+165
* | Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-2810-46/+70
|\ \
| * | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-2810-46/+70
| |/
* | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-2814-49/+122
|\ \
| * | Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-273-5/+20
| * | Fix Rubocop unused variables warningStan Hu2016-10-261-2/+2
| * | Remove puts to solve Rubocop errorsStan Hu2016-10-261-2/+0
| * | Fix duration specsKamil Trzcinski2016-10-261-14/+7
| * | Fix optimistic lockingKamil Trzcinski2016-10-267-16/+27
| * | Add tests for optimistic lockingKamil Trzcinski2016-10-265-7/+38
| * | Use optimistic lockingKamil Trzcinski2016-10-266-25/+50
* | | Merge branch 'issue-board-welcome-cookie-monster' into 'master' Robert Speicher2016-10-284-2/+9
|\ \ \
| * | | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-282-3/+5
| * | | Delete issue board welcome cookie when project is newPhil Hughes2016-10-283-2/+7
* | | | Merge branch 'clean-up-issue_spec.js' into 'master' Rémy Coutable2016-10-2810-95/+244
|\ \ \ \ | |/ / / |/| | |
| * | | Document how to run frontend testsWinnie2016-10-281-0/+14
| * | | Replace static issue fixtures by script (!6059)winniehell2016-10-289-42/+134
| * | | Clean up issue_spec.jswinniehell2016-10-281-59/+102
* | | | Merge branch 'fix/make-github-import-retryable' into 'master' Sean McGivern2016-10-2812-27/+120
|\ \ \ \
| * | | | Fix typosfix/make-github-import-retryableAhmad Sherif2016-10-282-2/+2
| * | | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importerAhmad Sherif2016-10-281-50/+34
| * | | | Use public_send instead of sendAhmad Sherif2016-10-281-1/+1
| * | | | Modify GitHub importer to be retryableAhmad Sherif2016-10-289-27/+136
| * | | | Check if repository already exists before trying to re-import itAhmad Sherif2016-10-282-2/+2
* | | | | Merge branch '5905-duplicate-email-errors' into 'master' Rémy Coutable2016-10-283-1/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 5905-duplicate-email-errorsSteve Halasz2016-10-271-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 5905-duplicate-email-errorsSteve Halasz2016-10-27401-873/+3487
| |\ \ \ \ \ \
| * | | | | | | Add changelog entrySteve Halasz2016-10-271-0/+1
| * | | | | | | Only show one error message for an invalid emailSteve Halasz2016-10-272-1/+14
* | | | | | | | Merge branch 'bugfix/dragging_milestones' into 'master' Sean McGivern2016-10-284-2/+90
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'bugfix/dragging_milestones' of gitlab.com:blackst0ne/gitlab-ce ...blackst0ne2016-10-280-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Stop unauthorized users dragging on milestone pageblackst0ne2016-10-284-2/+90
| * | | | | | | | Stop unauthorized users dragging on milestone pageblackst0ne2016-10-284-2/+90
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'deploykeys-api-doc' into 'master' Rémy Coutable2016-10-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Document admin access requirement for /deploy_keys endpointwinniehell2016-10-281-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master' Rémy Coutable2016-10-285-52/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-buggedAlejandro Rodríguez2016-10-275-52/+102
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '23890-api-should-accepts-boolean' into 'master' Sean McGivern2016-10-283-11/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-booleanRémy Coutable2016-10-273-11/+20
* | | | | | | | | Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-2844-499/+516
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Upgrade jira-ruby gem versionissue_1008_1Felipe Artur2016-10-263-4/+4
| * | | | | | | | | Finish updates to use JIRA gemFelipe Artur2016-10-2643-542/+391
| * | | | | | | | | Refactor JIRA service to use gemDrew Blessing2016-10-267-145/+313
* | | | | | | | | | Merge branch '23875-fixup-failing-spec' into 'master' Douwe Maan2016-10-281-4/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix a failing spec in diff_notes_resolve_spec.rbNick Thomas2016-10-281-4/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/gh-import-bugs' into 'master' Sean McGivern2016-10-284-13/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix importing MR comments from GitHubfix/gh-import-bugsAhmad Sherif2016-10-272-6/+8
View Lorry Controller Status