summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-144-6/+18
|\
| * Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-114-6/+18
* | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1428-86/+795
|\ \
| * | Improve build status specs contexts descriptionsGrzegorz Bizon2016-12-144-4/+4
| * | Add some missing tests for detailed status methodsbuild-statusesGrzegorz Bizon2016-12-143-2/+32
| * | Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-131-0/+23
| * | Extract abilities checking module from ability modelGrzegorz Bizon2016-12-131-0/+27
| * | Extend tests for pipeline detailed status helpersGrzegorz Bizon2016-12-131-12/+18
| * | Add tests for common build detailed status helpersGrzegorz Bizon2016-12-131-0/+37
| * | Add missing tests for build `cancelable?` methodGrzegorz Bizon2016-12-131-0/+36
| * | Add tests for detailed build statuses factoryGrzegorz Bizon2016-12-131-0/+141
| * | Make it possible to retry build that was canceledGrzegorz Bizon2016-12-131-0/+8
| * | Make build retryable only if complete and executedGrzegorz Bizon2016-12-131-8/+30
| * | Add tests for build cancelable/retryable statusesGrzegorz Bizon2016-12-132-0/+172
| * | Extend specs for build play/stop detailed statusesGrzegorz Bizon2016-12-132-7/+55
| * | Refine build stop/play extended status specsGrzegorz Bizon2016-12-132-31/+31
| * | Fix detailed status specs for pipeline stage modelGrzegorz Bizon2016-12-121-1/+3
| * | Fix pipeline specs for detailed statusesGrzegorz Bizon2016-12-121-8/+12
| * | Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-121-0/+59
| * | Add tests for build play extended detailed statusGrzegorz Bizon2016-12-122-3/+69
| * | Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-127-17/+41
| * | Fix tests related to detailed statuses and permissionsGrzegorz Bizon2016-12-1214-41/+45
* | | Merge branch '25651-fix-master' into 'master' Rémy Coutable2016-12-141-1/+1
|\ \ \
| * | | Fix wrong error message expectation in API::Commits spec25651-fix-masterRémy Coutable2016-12-141-1/+1
* | | | Merge branch 'process-commit-worker-migration-encoding' into 'master' Rémy Coutable2016-12-141-2/+25
|\ \ \ \
| * | | | Encode when migrating ProcessCommitWorker jobsprocess-commit-worker-migration-encodingYorick Peterse2016-12-131-2/+25
| | |/ / | |/| |
* | | | Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon2016-12-141-0/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | Changes after review25136-last-deployment-linkFilipa Lacerda2016-12-071-17/+14
| * | | Changes after reviewFilipa Lacerda2016-12-071-4/+4
| * | | Updates testsFilipa Lacerda2016-12-071-12/+30
| * | | Fix broken link for latest deploymentFilipa Lacerda2016-12-071-0/+22
* | | | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-131-0/+70
|\ \ \ \
| * | | | Make rubocop happyapi-cherry-pickRobert Schilling2016-12-131-1/+1
| * | | | API: Ability to cherry-pick a commitRobert Schilling2016-12-131-0/+70
| | |/ / | |/| |
* | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-131-1/+1
|\ \ \ \
| * | | | For single line git commit messages, the close quote should be on the same li...jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-131-1/+1
* | | | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-133-55/+68
|\ \ \ \ \
| * | | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-132-13/+2
| * | | | | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-122-42/+66
* | | | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable2016-12-131-0/+53
|\ \ \ \ \ \
| * | | | | | Move admin settings spinach feature to rspecjurre2016-12-131-0/+53
* | | | | | | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-131-2/+13
|\ \ \ \ \ \ \
| * | | | | | | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-131-2/+13
* | | | | | | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-131-0/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | Add failing test for #20190winniehell2016-12-131-0/+44
* | | | | | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-133-5/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-5/+5
| * | | | | | | | Create nested group factoryDmitriy Zaporozhets2016-12-112-0/+11
| * | | | | | | | Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-111-0/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' Sean McGivern2016-12-131-1/+1
|\ \ \ \ \ \ \ \