Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-rails | Lin Jen-Shin | 2016-08-09 | 2 | -2/+2 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'upgrade-grape' into 'master' | Rémy Coutable | 2016-08-09 | 5 | -15/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add Changelog entry for Grape upgrade [ci skip] | Connor Shea | 2016-08-09 | 1 | -0/+1 | |
| * | | | | | | | | | | Fix Grape tests. | Connor Shea | 2016-08-09 | 1 | -10/+5 | |
| * | | | | | | | | | | Retain old behavior | Connor Shea | 2016-08-09 | 1 | -2/+4 | |
| * | | | | | | | | | | Update Grape from 0.13.0 to 0.15.0. | Connor Shea | 2016-08-09 | 2 | -3/+3 | |
* | | | | | | | | | | | Merge branch 'fix/improve-ci-node-validatable-to-prevent-memory-leak' into 'm... | Stan Hu | 2016-08-09 | 2 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Memoize CI config node validator to prevent leaksfix/improve-ci-node-validatable-to-prevent-memory-leak | Grzegorz Bizon | 2016-08-09 | 2 | -6/+8 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'active-tense-test-coverage' into 'master' | Rémy Coutable | 2016-08-09 | 186 | -1402/+1404 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | adds second batch of tests changed to active tenseactive-tense-test-coverage | tiagonbotelho | 2016-08-09 | 114 | -1083/+1084 | |
| * | | | | | | | | | fixes part1 of files to start using active tense | tiagonbotelho | 2016-08-09 | 75 | -321/+322 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'fix-rubocop' into 'master' | Hannes Rosenögger | 2016-08-09 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove offending empty line | winniehell | 2016-08-09 | 1 | -1/+0 | |
* | | | | | | | | | | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set' | Rémy Coutable | 2016-08-09 | 3 | -0/+47 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Avoid to show the original password field when password is automatically seted | Carlos Ribeiro | 2016-08-08 | 3 | -0/+47 | |
* | | | | | | | | | | Merge branch 'fix/remove-legacy-ci-static-model' into 'master' | Robert Speicher | 2016-08-08 | 1 | -49/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove legacy Ci::StaticModel we do not use anymorefix/remove-legacy-ci-static-model | Grzegorz Bizon | 2016-08-08 | 1 | -49/+0 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' | Robert Speicher | 2016-08-08 | 6 | -10/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove empty context from CI config processor specsrubocop/enable-more-cops-for-empty-lines | Grzegorz Bizon | 2016-08-05 | 1 | -3/+0 | |
| * | | | | | | | | | | Enable some Rubocop cops related to new lines | Grzegorz Bizon | 2016-08-03 | 7 | -8/+2 | |
* | | | | | | | | | | | Merge branch 'dz-newlines-styleguide' into 'master' | Robert Speicher | 2016-08-08 | 2 | -0/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add newlines styleguide for Ruby codedz-newlines-styleguide | Dmitriy Zaporozhets | 2016-08-05 | 2 | -0/+104 | |
* | | | | | | | | | | | | Merge branch 'tombell/gitlab-ce-configure-change-password-notification' | Douwe Maan | 2016-08-08 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update to send changed password notification emails | Tom Bell | 2016-08-05 | 2 | -0/+4 | |
* | | | | | | | | | | | | Merge branch '20129-update-version_sorter-gem-to-optimize-tag-sorting' into '... | Yorick Peterse | 2016-08-08 | 4 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update version_sorter and use new interface for faster tag sorting | Alejandro Rodríguez | 2016-08-08 | 4 | -6/+5 | |
* | | | | | | | | | | | | | Merge branch 'zj-enable-deploy-keys-api' into 'master' | Douwe Maan | 2016-08-08 | 9 | -163/+326 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Namespace EnableDeployKeyService under Projects | Z.J. van de Weg | 2016-08-08 | 5 | -18/+22 | |
| * | | | | | | | | | | | | | Fix styling on docs of Deploy Keys endpointszj-enable-deploy-keys-api | Z.J. van de Weg | 2016-08-05 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | Create service for enabling deploy keys | Z.J. van de Weg | 2016-08-05 | 5 | -22/+58 | |
| * | | | | | | | | | | | | | Move deploy_key tests to deploy_key_spec.rb | Z.J. van de Weg | 2016-08-04 | 3 | -78/+81 | |
| * | | | | | | | | | | | | | Use Grape DSL for deploy keys endpoints | Z.J. van de Weg | 2016-08-03 | 2 | -40/+34 | |
| * | | | | | | | | | | | | | Endpoints to enable and disable deploy keys | Z.J. van de Weg | 2016-08-03 | 5 | -38/+165 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'git-http-push-check' into 'master' | Robert Speicher | 2016-08-08 | 4 | -29/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix ArgumentError in GitAccess specs | Jacob Vosmaer | 2016-08-04 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | Stop 'git push' over HTTP early | Jacob Vosmaer | 2016-08-03 | 3 | -23/+28 | |
* | | | | | | | | | | | | | | Merge branch 'patch-3' into 'master' | Achilleas Pipinellis | 2016-08-08 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!" | Jeffrey Lin | 2016-08-08 | 2 | -1/+4 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' | Douwe Maan | 2016-08-08 | 4 | -8/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBody | Gabriel Mazetto | 2016-08-06 | 3 | -3/+1 | |
| * | | | | | | | | | | | | | Enable Style/EmptyLinesAroundModuleBody cop | Gabriel Mazetto | 2016-08-06 | 3 | -5/+1 | |
* | | | | | | | | | | | | | | Merge branch 'revert-host-header-overwrite' into 'master' | Douwe Maan | 2016-08-08 | 2 | -12/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Revert "Defend against 'Host' header injection" | Jacob Vosmaer | 2016-08-08 | 2 | -12/+2 | |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' | Douwe Maan | 2016-08-08 | 13 | -21/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefault | Gabriel Mazetto | 2016-08-06 | 13 | -21/+18 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'decode-log-postreceive-args' into 'master' | Douwe Maan | 2016-08-08 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Log base64-decoded PostReceive arguments | Jacob Vosmaer | 2016-08-05 | 2 | -1/+4 | |
* | | | | | | | | | | | | | | Merge branch 'fix/import-pending-user' into 'master' | Rémy Coutable | 2016-08-08 | 3 | -5/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Support pending invitation project members importing projects | James Lopez | 2016-08-08 | 3 | -5/+29 | |
* | | | | | | | | | | | | | | | Merge branch 'faster-cache-keys' into 'master' | Rémy Coutable | 2016-08-08 | 5 | -0/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |