summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-281-0/+98
|\
| * Remove config lines in one placeJacob Vosmaer2017-04-281-3/+3
| * Use rspec 'be'Jacob Vosmaer2017-04-281-1/+1
| * Refactor timeout codeJacob Vosmaer2017-04-281-8/+17
| * Add test that asserts unicorns terminateJacob Vosmaer2017-04-261-0/+89
* | Add board_move slash commandAlex Sanford2017-04-281-8/+78
* | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-286-14/+477
* | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2810-153/+1066
|\ \
| * | Use new renamed markup methoddm-blob-viewersDouwe Maan2017-04-271-0/+2
| * | Address feedbackDouwe Maan2017-04-273-28/+34
| * | Added specs for JS method to switch viewsPhil Hughes2017-04-271-2/+39
| * | Fixed failing JS testsPhil Hughes2017-04-271-3/+7
| * | Satisfy RubocopDouwe Maan2017-04-272-2/+0
| * | Add specsDouwe Maan2017-04-279-45/+898
| * | Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-275-12/+7
| * | Add test stubsDouwe Maan2017-04-277-191/+31
| * | Fix some specsDouwe Maan2017-04-272-5/+5
| * | Add specsDouwe Maan2017-04-273-13/+191
* | | Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-271-0/+10
|\ \ \
| * | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-261-0/+10
* | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-273-29/+75
|\ \ \ \
| * | | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-273-29/+75
* | | | | Make api/v3/deployments_spec to actually tests v3dz-fix-v3-api-deployments-specDmitriy Zaporozhets2017-04-271-6/+6
| |_|/ / |/| | |
* | | | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-275-24/+38
|\ \ \ \
| * | | | tadds migration to remove invalid servicesTiago Botelho2017-04-275-25/+35
| * | | | remove invalid servicesTiago Botelho2017-04-261-0/+4
* | | | | Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-271-0/+24
|\ \ \ \ \
| * | | | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimizedLuke "Jared" Bennett2017-04-261-0/+24
* | | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-272-0/+50
|\ \ \ \ \ \
| * | | | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-272-0/+50
| |/ / / / /
* | | | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-271-0/+1
|\ \ \ \ \ \
| * | | | | | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-261-0/+1
* | | | | | | Merge branch 'dz-add-cohort-spec' into 'master' Sean McGivern2017-04-271-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Increase code coverage for admin/cohorts pagedz-add-cohort-specDmitriy Zaporozhets2017-04-271-0/+15
* | | | | | | | Remove unused codeFilipa Lacerda2017-04-271-0/+64
* | | | | | | | Use vue files for vue components.Filipa Lacerda2017-04-272-2/+7
* | | | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' Rémy Coutable2017-04-271-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-adminToon Claes2017-04-271-0/+16
| |/ / / / / / /
* | | | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-278-57/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
| * | | | | | | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-19/+2
| * | | | | | | | Fix failing specsToon Claes2017-04-272-2/+2
| * | | | | | | | Refactor MarkupHelperDouwe Maan2017-04-271-10/+10
| * | | | | | | | Cache the rendered README, but post-process on showToon Claes2017-04-273-31/+28
| * | | | | | | | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-271-2/+0
| * | | | | | | | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-274-4/+4
| |/ / / / / / /
* | | | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-271-1/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-261-1/+27
* | | | | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-274-5/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix rendering emoji inside a stringblackst0ne2017-04-254-5/+38
View Lorry Controller Status