summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* spellcheckupdate-ui-guide--svgsTaurie Davis2016-08-091-2/+2
* Add svg guidelines to ui guideTaurie Davis2016-08-091-0/+36
* Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-092-5/+21
|\
| * Do not look up commit again when it is passed to RelativeLinkFilter (!5455)winniehell2016-08-021-3/+3
| * Add failing test for #20026winniehell2016-08-021-2/+18
* | Merge branch 'group-icon-alignment' into 'master' Jacob Schatz2016-08-091-1/+1
|\ \
| * | Align visibility icons on group pagegroup-icon-alignmentAnnabel Dunstone2016-07-251-1/+1
* | | Merge branch 'coffeescript-coverage' into 'master' Robert Speicher2016-08-093-4/+15
|\ \ \
| * | | Add test coverage analysis for CoffeeScript (!5052)winniehell2016-08-073-4/+15
* | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-094-9/+34
|\ \ \ \
| * | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-094-9/+34
* | | | | 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 '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-095-15/+13
|\ \ \ \ \ \ \
| * | | | | | | Add Changelog entry for Grape upgrade [ci skip]Connor Shea2016-08-091-0/+1
| * | | | | | | Fix Grape tests.Connor Shea2016-08-091-10/+5
| * | | | | | | Retain old behaviorConnor Shea2016-08-091-2/+4
| * | | | | | | Update Grape from 0.13.0 to 0.15.0.Connor Shea2016-08-092-3/+3
* | | | | | | | Merge branch 'fix/improve-ci-node-validatable-to-prevent-memory-leak' into 'm...Stan Hu2016-08-092-6/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Memoize CI config node validator to prevent leaksfix/improve-ci-node-validatable-to-prevent-memory-leakGrzegorz Bizon2016-08-092-6/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'active-tense-test-coverage' into 'master' Rémy Coutable2016-08-09186-1402/+1404
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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