summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clean up project destructionclean-up-project-destroyStan Hu2016-08-108-18/+12
* Merge branch 'add-column-with-default-to-downtime-guide' into 'master' Achilleas Pipinellis2016-08-101-0/+8
|\
| * Mention add_column_with_default in downtime guideadd-column-with-default-to-downtime-guideYorick Peterse2016-08-101-0/+8
* | Merge branch 'fix-angle-brackets-in-docs' into 'master' Achilleas Pipinellis2016-08-104-4/+4
|\ \
| * | Fix escaped angle bracket's in integration documentation.Eric K Idema2016-05-124-4/+4
* | | Merge branch 'fix-filter-label-tooltip' into 'master' Fatih Acet2016-08-103-5/+13
|\ \ \
| * | | Fix filter label tooltip HTML renderingClement Ho2016-08-043-5/+13
* | | | Merge branch 'use-cached-project-count-ce' into 'master' Rémy Coutable2016-08-102-1/+2
|\ \ \ \
| * | | | Used cached value of project count to reduce DB loadRémy Coutable2016-08-102-1/+2
* | | | | Merge branch 'update-ui-guide--svgs' into 'master' Dmitriy Zaporozhets2016-08-101-0/+36
|\ \ \ \ \
| * | | | | spellcheckupdate-ui-guide--svgsTaurie Davis2016-08-091-2/+2
| * | | | | Add svg guidelines to ui guideTaurie Davis2016-08-091-0/+36
* | | | | | Merge branch 'doc-styleguides' into 'master' Achilleas Pipinellis2016-08-101-4/+3
|\ \ \ \ \ \
| * | | | | | Small refactor of doc/development/README.mdAchilleas Pipinellis2016-08-101-4/+3
* | | | | | | Merge branch 'add-mailmap' into 'master' Rémy Coutable2016-08-101-0/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add an initial .mailmapChristian Couder2016-08-061-0/+35
* | | | | | | Removed extra newline from redis_spec.rbYorick Peterse2016-08-101-1/+0
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'zj-import-gitlab-fa-icon' into 'master' Rémy Coutable2016-08-101-26/+12
|\ \ \ \ \ \
| * | | | | | Remove duplicate link_to statementszj-import-gitlab-fa-iconZ.J. van de Weg2016-08-101-12/+6
| * | | | | | Use FA GitLab Icon for import project buttonZ.J. van de Weg2016-08-081-18/+10
* | | | | | | Merge branch 'link-to-gdk-howtos' into 'master' Achilleas Pipinellis2016-08-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Link to doc root, not readme of GDKJacob Vosmaer2016-08-081-1/+1
* | | | | | | | Merge branch 'api-examples-curl-long-options' into 'master' Achilleas Pipinellis2016-08-1046-673/+696
|\ \ \ \ \ \ \ \
| * | | | | | | | use Unix line endings for API documentationwinniehell2016-08-091-514/+514
| * | | | | | | | use long options for curl examples in API documentation (!5703)winniehell2016-08-0944-161/+162
| * | | | | | | | add linting script for documentationwinniehell2016-08-092-0/+22
* | | | | | | | | Merge branch 'default-label-documentation' into 'master' Achilleas Pipinellis2016-08-103-10/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify the features for generating default label setsMark Fletcher2016-08-093-10/+31
* | | | | | | | | | 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 'add-caching-for-project-count' into 'master' Robert Speicher2016-08-093-0/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a method in Project to return a cached value of total count of projectsStan Hu2016-08-093-0/+27
* | | | | | | | | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-094-15/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-094-15/+39
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-0910-177/+81
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-084-14/+51
| * | | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-08-081-0/+1
| * | | | | | | | | | | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-083-36/+28
| * | | | | | | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-043-12/+5
| * | | | | | | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-044-123/+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-0916-121/+604
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-064-9/+16
| * | | | | | | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-044-7/+7
| * | | | | | | | | | | Added Redis sentinel support to the CHANGELOGGabriel Mazetto2016-08-041-0/+1
| * | | | | | | | | | | Updated documentations for Redis Sentinel experimental supportGabriel Mazetto2016-08-041-23/+28
| * | | | | | | | | | | Refactor Redis HA docs to also include SentinelAchilleas Pipinellis2016-08-041-102/+245
| * | | | | | | | | | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-042-1/+108
| * | | | | | | | | | | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| * | | | | | | | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-043-23/+23