summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-093-0/+47
|\ \ | |/ |/|
| * Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-083-0/+47
* | 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 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher2016-08-086-10/+2
|\ \ \
| * | | 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-037-8/+2
* | | | Merge branch 'dz-newlines-styleguide' into 'master' Robert Speicher2016-08-082-0/+104
|\ \ \ \
| * | | | Add newlines styleguide for Ruby codedz-newlines-styleguideDmitriy Zaporozhets2016-08-052-0/+104
* | | | | Merge branch 'tombell/gitlab-ce-configure-change-password-notification'Douwe Maan2016-08-082-0/+4
|\ \ \ \ \
| * | | | | Update to send changed password notification emailsTom Bell2016-08-052-0/+4
* | | | | | Merge branch '20129-update-version_sorter-gem-to-optimize-tag-sorting' into '...Yorick Peterse2016-08-084-6/+5
|\ \ \ \ \ \
| * | | | | | Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-084-6/+5
* | | | | | | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-089-163/+326
|\ \ \ \ \ \ \
| * | | | | | | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-085-18/+22
| * | | | | | | Fix styling on docs of Deploy Keys endpointszj-enable-deploy-keys-apiZ.J. van de Weg2016-08-051-3/+2
| * | | | | | | Create service for enabling deploy keysZ.J. van de Weg2016-08-055-22/+58
| * | | | | | | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-043-78/+81
| * | | | | | | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-032-40/+34
| * | | | | | | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-035-38/+165
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-084-29/+34
|\ \ \ \ \ \ \
| * | | | | | | Fix ArgumentError in GitAccess specsJacob Vosmaer2016-08-041-6/+6
| * | | | | | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-033-23/+28
* | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-082-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!"Jeffrey Lin2016-08-082-1/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-084-8/+2
|\ \ \ \ \ \ \
| * | | | | | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBodyGabriel Mazetto2016-08-063-3/+1
| * | | | | | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-063-5/+1
* | | | | | | | 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-0813-21/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-0613-21/+18
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-082-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-052-1/+4
* | | | | | | | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-083-5/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support pending invitation project members importing projectsJames Lopez2016-08-083-5/+29
* | | | | | | | | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-085-0/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-085-0/+36
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'update-templates' into 'master' Rémy Coutable2016-08-083-19/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update templatesZ.J. van de Weg2016-08-083-19/+19
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-08100-636/+1275
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'branch-permissions' into 'master' Jacob Schatz2016-08-0818-229/+350
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Ensure we are looking for the right dropdown inside the form wrapperbranch-permissionsAlfredo Sumaran2016-08-051-2/+2
| | * | | | | | | | | | Set for for labels and ID for dropdowns on create formAlfredo Sumaran2016-08-052-5/+6
| | * | | | | | | | | | Fix .panel-title styleAlfredo Sumaran2016-08-053-2/+9
| | * | | | | | | | | | Refine selector for form submit buttonAlfredo Sumaran2016-08-051-1/+1
View Lorry Controller Status