summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollbackJames Edwards-Jones2017-06-201-0/+61
* Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-011-0/+9
|\
| * Extend spec tests for deploy_key can_pushRichard Clamp2017-05-231-0/+9
* | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-011-0/+33
|\ \
| * | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-311-0/+33
* | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-011-53/+98
|\ \ \
| * | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-011-53/+98
| |/ /
* | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-0/+27
|\ \ \
| * | | Fix rubocop in spec/helpers/diff_helper_spec.rbValery Sizov2017-06-011-6/+7
| * | | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-311-0/+26
* | | | Merge branch 'notebook-katex-fixes' into 'master'Filipa Lacerda2017-06-013-1/+64
|\ \ \ \
| * | | | added testsnotebook-katex-fixesPhil Hughes2017-05-303-1/+64
* | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-017-98/+68
|\ \ \ \ \
| * | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-311-9/+9
| * | | | | Fix Diff#too_large? and specsDouwe Maan2017-05-303-50/+20
| * | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-297-61/+61
* | | | | | Merge branch 'dm-emails-are-not-user-references' into 'master'Sean McGivern2017-06-011-0/+5
|\ \ \ \ \ \
| * | | | | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-311-0/+5
* | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-3159-202/+1574
|\ \ \ \ \ \ \
| * | | | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-314-2/+213
| |/ / / / / /
| * | | | | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-311-0/+13
| |\ \ \ \ \ \
| | * | | | | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-301-0/+13
| * | | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3123-122/+294
| |\ \ \ \ \ \ \
| | * | | | | | | Rename the other jobsrename-builds-controllerLin Jen-Shin2017-05-311-8/+8
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3119-59/+475
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update jobs_spec for changes from builds_specLin Jen-Shin2017-05-312-496/+18
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3196-667/+1896
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-268-11/+11
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-26326-1970/+5734
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-241-28/+0
| | * | | | | | | | | Separate artifacts from builds, reusing artifacts_action_pathLin Jen-Shin2017-05-191-6/+6
| | * | | | | | | | | Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-194-1/+130
| | * | | | | | | | | Disable rubocop hash check for blocksLin Jen-Shin2017-05-181-1/+1
| | * | | | | | | | | Add backward compatible routes for buildsLin Jen-Shin2017-05-181-0/+548
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-189-27/+113
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-1720-105/+106
| * | | | | | | | | | | Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-312-2/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use native change event in the spec to trigger addEventListenerJared Deckard2017-05-232-2/+6
| * | | | | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-3115-18/+916
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | fixed issuable shortcuts not workingPhil Hughes2017-05-301-1/+1
| | * | | | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-30125-1157/+3397
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warningPhil Hughes2017-05-262-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | fixed move issue specsPhil Hughes2017-05-252-4/+6
| | * | | | | | | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-251-1/+21
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | renamed path to web_url in endpointPhil Hughes2017-05-251-6/+6
| | * | | | | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-25313-2074/+4798
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fixed karma failuresPhil Hughes2017-05-244-16/+24
| | * | | | | | | | | | | | | Merge branch 'issue-edit-inline-getdata-after-update' into 'issue-edit-inline'Filipa Lacerda2017-05-241-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Get new data after inline edit saveissue-edit-inline-getdata-after-updatePhil Hughes2017-05-221-0/+24
| | * | | | | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-223-0/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
View Lorry Controller Status