summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IERémy Coutable2017-01-204-131/+125
|\
| * Convert MoveToProjectFinder specs to use `:empty_project`Robert Speicher2017-01-191-10/+10
| * Convert most MergeRequest model specs to use `:empty_project`Robert Speicher2017-01-191-22/+22
| * Convert most User model specs to use `:empty_project`Robert Speicher2017-01-191-45/+39
| * Convert most Project model specs to use `:empty_project`Robert Speicher2017-01-191-54/+54
* | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-204-6/+26
|\ \
| * | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-183-6/+6
| * | Corrected code style and titlesJose Ivan Vargas2017-01-181-2/+2
| * | Fixed more testsJose Ivan Vargas2017-01-181-1/+1
| * | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-181-0/+20
* | | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-204-6/+103
|\ \ \
| * | | Fix specsKamil Trzcinski2017-01-201-4/+6
| * | | Fix specsKamil Trzcinski2017-01-191-1/+2
| * | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-1991-481/+1472
| |\ \ \
| * | | | Fix specsKamil Trzcinski2017-01-191-5/+28
| * | | | Add missing build_specKamil Trzcinski2017-01-191-0/+10
| * | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19472-4328/+22081
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | WIP: Add tests and make sure that headers are set21698-redis-runner-last-buildLin Jen-Shin2017-01-043-2/+73
* | | | | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-193-1/+142
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adds testsFilipa Lacerda2017-01-123-1/+142
* | | | | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-191-5/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use bootstrap dropdown events to only make the request when the dropdown is b...26601-dropdown-makes-request-closeFilipa Lacerda2017-01-131-5/+6
| |/ / /
* | | | Merge branch 'use-empty_project-factory-in-api-specs' into 'master' Robert Speicher2017-01-1919-54/+53
|\ \ \ \
| * | | | Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specsRémy Coutable2017-01-1719-54/+53
* | | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' in...Robert Speicher2017-01-192-2/+4
|\ \ \ \ \
| * | | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_pathRémy Coutable2017-01-182-2/+4
* | | | | | Merge branch 'fix-dashboard-spec' into 'master' Rémy Coutable2017-01-191-1/+1
|\ \ \ \ \ \
| * | | | | | Fix todos specSean McGivern2017-01-191-1/+1
* | | | | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-pageFatih Acet2017-01-191-0/+27
|\ \ \ \ \ \ \
| * | | | | | | Autoresize markdown previewdidemacet-markdown-area-height-fixClement Ho2017-01-171-0/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+23
* | | | | | | | Merge branch 'allow-shared-examples-jasmine' into 'master' Fatih Acet2017-01-194-2/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Add first shared examples to a helper and updated teaspoon_env to allow helpe...allow-shared-examples-jasmineLuke "Jared" Bennett2017-01-184-2/+48
* | | | | | | | | Merge branch 'simple-eslint-fixes' into 'master' Fatih Acet2017-01-1934-382/+352
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | resolve all prefer-const eslint violationsMike Greiling2017-01-183-17/+16
| * | | | | | | | | resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-186-98/+104
| * | | | | | | | | resolve all indent eslint violationsMike Greiling2017-01-186-66/+69
| * | | | | | | | | resolve all no-trailing-spaces eslint violationsMike Greiling2017-01-181-1/+1
| * | | | | | | | | resolve all padded-blocks eslint violationsMike Greiling2017-01-1828-66/+28
| * | | | | | | | | resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-189-197/+197
| * | | | | | | | | resolve all no-plusplus eslint violationsMike Greiling2017-01-185-21/+21
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'wip-mr-from-commits' into 'master' Sean McGivern2017-01-195-1/+180
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Show a custom WIP help message for MR's with WIP commitsjurre2017-01-191-0/+63
| * | | | | | | | Mark MR as WIP when pushing WIP commitsjurre2017-01-194-1/+117
* | | | | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-197-0/+256
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-188-91/+71
| * | | | | | | | | Add Presentable concernRémy Coutable2017-01-181-0/+15
| * | | | | | | | | Improve presenter factoryRémy Coutable2017-01-182-48/+42
| * | | | | | | | | Improve presenter architectureRémy Coutable2017-01-188-87/+202
View Lorry Controller Status