summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-093-83/+41
|\
| * Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-082-8/+37
| * Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-081-7/+1
| * Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-4/+4
| * Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-041-65/+0
* | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-096-24/+142
|\ \
| * | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-063-8/+11
| * | Small refactor and a few documentation fixesGabriel Mazetto2016-08-041-2/+2
| * | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-041-24/+19
| * | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-041-20/+16
| * | Specs for RedisConfigGabriel Mazetto2016-08-045-0/+124
| |/
* | Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-091-2/+18
|\ \
| * | Add failing test for #20026winniehell2016-08-021-2/+18
* | | Merge branch 'coffeescript-coverage' into 'master' Robert Speicher2016-08-091-4/+4
|\ \ \
| * | | Add test coverage analysis for CoffeeScript (!5052)winniehell2016-08-071-4/+4
* | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-092-3/+25
|\ \ \ \
| * | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-092-3/+25
* | | | | Merge branch 'fix-broadcast-message-factory-date-range' into 'master' Robert Speicher2016-08-091-2/+2
|\ \ \ \ \
| * | | | | TST: Use more accurate time windows so tests do not failjoshbabier2016-08-041-2/+2
* | | | | | Merge branch 'upgrade-grape' into 'master' Rémy Coutable2016-08-091-10/+5
|\ \ \ \ \ \
| * | | | | | Fix Grape tests.Connor Shea2016-08-091-10/+5
* | | | | | | Merge branch 'fix/improve-ci-node-validatable-to-prevent-memory-leak' into 'm...Stan Hu2016-08-091-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Memoize CI config node validator to prevent leaksfix/improve-ci-node-validatable-to-prevent-memory-leakGrzegorz Bizon2016-08-091-0/+4
| | |/ / / / | |/| | | |
* | | | | | adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-09114-1083/+1084
* | | | | | fixes part1 of files to start using active tensetiagonbotelho2016-08-0975-321/+322
|/ / / / /
* | | | | Merge branch 'fix-rubocop' into 'master' Hannes Rosenögger2016-08-091-1/+0
|\ \ \ \ \
| * | | | | remove offending empty linewinniehell2016-08-091-1/+0
* | | | | | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+45
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+45
* | | | | | Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher2016-08-085-8/+0
|\ \ \ \ \ \
| * | | | | | Remove empty context from CI config processor specsrubocop/enable-more-cops-for-empty-linesGrzegorz Bizon2016-08-051-3/+0
| * | | | | | Enable some Rubocop cops related to new linesGrzegorz Bizon2016-08-036-6/+0
* | | | | | | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-084-111/+188
|\ \ \ \ \ \ \
| * | | | | | | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-2/+2
| * | | | | | | Create service for enabling deploy keysZ.J. van de Weg2016-08-052-5/+35
| * | | | | | | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-042-73/+75
| * | | | | | | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-031-1/+0
| * | | | | | | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-032-38/+84
| |/ / / / / /
* | | | | | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-082-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix ArgumentError in GitAccess specsJacob Vosmaer2016-08-041-6/+6
| * | | | | | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-082-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-062-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-0/+20
|\ \ \ \ \ \
| * | | | | | Support pending invitation project members importing projectsJames Lopez2016-08-081-0/+20
| |/ / / / /
* | | | | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-081-0/+17
|\ \ \ \ \ \
| * | | | | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-081-0/+17
| |/ / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-086-33/+143
|\ \ \ \ \ \
| * | | | | | Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
| * | | | | | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-3/+3