summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-1/+1
* Merge branch 'rs-rename-run-helper' into 'master' Douwe Maan2016-08-104-17/+15
|\
| * Rename `run` task helper method to prevent conflict with StateMachineRobert Speicher2016-08-094-17/+15
* | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-094-87/+39
|\ \
| * | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-082-6/+14
| * | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-082-29/+27
| * | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-5/+1
| * | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-042-54/+0
| * | Check out locally PRs where the source/target branch were removedDouglas Barbosa Alexandre2016-08-041-7/+11
* | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-092-25/+116
|\ \ \ | |_|/ |/| |
| * | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-061-1/+5
| * | Small refactor and a few documentation fixesGabriel Mazetto2016-08-042-3/+3
| * | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-042-7/+7
| * | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-042-1/+9
| * | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-042-9/+10
| * | Specs for RedisConfigGabriel Mazetto2016-08-041-1/+1
| * | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-042-25/+103
| |/
* | Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-091-3/+3
|\ \
| * | Do not look up commit again when it is passed to RelativeLinkFilter (!5455)winniehell2016-08-021-3/+3
* | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-091-6/+8
|\ \ \
| * | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-091-6/+8
* | | | Merge branch 'avoid-constant-warnings-in-rails' into 'master' Robert Speicher2016-08-092-2/+2
|\ \ \ \
| * | | | Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-railsLin Jen-Shin2016-08-092-2/+2
* | | | | Merge branch 'upgrade-grape' into 'master' Rémy Coutable2016-08-091-2/+4
|\ \ \ \ \
| * | | | | Retain old behaviorConnor Shea2016-08-091-2/+4
| | |/ / / | |/| | |
* | | | | Memoize CI config node validator to prevent leaksfix/improve-ci-node-validatable-to-prevent-memory-leakGrzegorz Bizon2016-08-091-6/+4
|/ / / /
* | | | Merge branch 'fix/remove-legacy-ci-static-model' into 'master' Robert Speicher2016-08-081-49/+0
|\ \ \ \
| * | | | Remove legacy Ci::StaticModel we do not use anymorefix/remove-legacy-ci-static-modelGrzegorz Bizon2016-08-081-49/+0
| |/ / /
* | | | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-081-38/+66
|\ \ \ \
| * | | | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-1/+2
| * | | | Create service for enabling deploy keysZ.J. van de Weg2016-08-051-3/+3
| * | | | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-041-5/+6
| * | | | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-031-39/+34
| * | | | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-031-0/+31
| | |/ / | |/| |
* | | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-081-1/+1
|\ \ \ \
| * | | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-1/+1
| |/ / /
* | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-082-4/+0
|\ \ \ \
| * | | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBodyGabriel Mazetto2016-08-062-2/+0
| * | | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-061-2/+0
| | |/ / | |/| |
* | | | Merge branch 'revert-host-header-overwrite' into 'master' Douwe Maan2016-08-082-12/+2
|\ \ \ \
| * | | | Revert "Defend against 'Host' header injection"Jacob Vosmaer2016-08-082-12/+2
| |/ / /
* | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-084-4/+4
|\ \ \ \
| * | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-064-4/+4
| |/ / /
* | | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-081-1/+0
|\ \ \ \
| * | | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-051-1/+0
* | | | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-5/+8
|\ \ \ \ \
| * | | | | Support pending invitation project members importing projectsJames Lopez2016-08-081-5/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-081-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Ignore URLs starting with // (!5677)winniehell2016-08-051-1/+2
| | |_|/ | |/| |
* | | | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-051-0/+2
|\ \ \ \ | |/ / / |/| | |
View Lorry Controller Status