summaryrefslogtreecommitdiff
path: root/spec/services
Commit message (Expand)AuthorAgeFilesLines
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-0/+11
* Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-291-6/+6
* Fix `git_push_service_spec`Timothy Andrew2016-07-291-1/+2
* Fix default branch protection.Timothy Andrew2016-07-291-5/+12
* Merge branch 'fix-data-integrity-issue-with-repository-downloads-path' into '...Douwe Maan2016-07-211-0/+81
|\
| * Extract helper methods to clean up RepositoryArchiveCleanUpService specDouglas Barbosa Alexandre2016-07-211-66/+37
| * Use Dir.mktmpdir instead of FileUtils.mkdir_p in the specDouglas Barbosa Alexandre2016-07-211-48/+56
| * Use find instead Ruby to remove files due to performance reasonsDouglas Barbosa Alexandre2016-07-211-19/+8
| * Cover the behavior RepositoryArchiveCleanUpService with testsDouglas Barbosa Alexandre2016-07-211-7/+89
| * Add service to clean up repository archive cacheDouglas Barbosa Alexandre2016-07-211-0/+31
* | Merge branch 'rs-bulk-issues-update-spec' into 'master' Robert Speicher2016-07-211-76/+55
|\ \ | |/ |/|
| * Refactor Issues::BulkUpdateService specrs-bulk-issues-update-specRobert Speicher2016-07-201-76/+55
* | Get rid of `is_image` in FileUploaderRémy Coutable2016-07-192-12/+0
|/
* Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'Douwe Maan2016-07-181-0/+38
|\
| * Allow bulk (un)subscription from issues in issue indexCairo Noleto2016-07-141-0/+38
* | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-182-4/+13
|\ \
| * | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-182-4/+13
* | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-181-1/+2
|\ \ \
| * | | Make rubocop happytrack-pipeline-userKamil Trzcinski2016-07-151-1/+1
| * | | Track a user who created a pipelineKamil Trzcinski2016-07-151-1/+2
| | |/ | |/|
* | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-181-0/+16
|\ \ \
| * | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-161-0/+16
| | |/ | |/|
* | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-181-25/+79
|\ \ \ | |/ / |/| |
| * | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-151-25/+79
| |/
* | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-151-15/+20
|\ \
| * | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-141-15/+20
| |/
* | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-151-0/+18
|/
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-132-13/+4
* Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-1/+2
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-2/+1
* Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-2/+11
* Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1217-27/+27
* Reset project pushes_since_gc when we enqueue the git gc callPaco Guzman2016-07-121-9/+33
* Expire the branch cache after `git gc` runsStan Hu2016-07-121-2/+2
* Allow SentNotification#position to be set as string or hashDouwe Maan2016-07-111-0/+24
* Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
* Add tests for DiffPositionUpdateServiceDouwe Maan2016-07-061-0/+71
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-1/+1
* Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-0/+10
* Better message for git hooks and file locksValery Sizov2016-07-042-7/+7
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-015-15/+0
* Merge branch 'fix-external-issue-rendering' into 'master' Robert Speicher2016-06-301-0/+2
|\
| * Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-renderingStan Hu2016-06-301-0/+2
* | Expire branch/tag git data when needed.18709-branch-tag-collection-cachingPaco Guzman2016-06-302-0/+61
* | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-293-11/+11
|/
* Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-271-0/+59
|\
| * Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-221-8/+30
| * Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-221-0/+37
* | Add support for "skip ci" tooSimon Welsh2016-06-251-1/+32
* | Allow "ci skip" to be in any caseSimon Welsh2016-06-251-0/+15
|/