summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix error message for existing labels.label-flashFatih Acet2016-08-112-5/+10
* Merge branch 'cs-remove-inline-js' into 'master' Fatih Acet2016-08-103-6/+7
|\
| * Make sure Labels is instantiated on edit pagecs-remove-inline-jsAlfredo Sumaran2016-07-271-1/+4
| * Removes two simple instances of inline JavaScript.Connor Shea2016-07-263-6/+4
* | Merge branch 'explicit-arguments-on-diff_file_html_data' into 'master' Yorick Peterse2016-08-103-4/+4
|\ \
| * | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-103-4/+4
* | | Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-106-52/+292
|\ \ \
| * | | Mention that gitlab.rb must be kept, toodecouple-secret-keysSean McGivern2016-08-041-11/+12
| * | | Ignore Rails/Exit cop in initializerSean McGivern2016-08-041-1/+1
| * | | Mention that gitlab.rb needs to be keptSean McGivern2016-08-031-7/+7
| * | | Clarify intentions of secret token initializerSean McGivern2016-08-031-35/+55
| * | | Give priority to environment variablesSean McGivern2016-08-032-10/+88
| * | | Store all secret keys in secrets.ymlSean McGivern2016-08-033-58/+53
| * | | Store OTP secret key in secrets.ymlSean McGivern2016-08-036-53/+199
* | | | Merge branch 'clean-up-project-destroy' into 'master' Robert Speicher2016-08-108-18/+12
|\ \ \ \
| * | | | Clean up project destructionclean-up-project-destroyStan Hu2016-08-108-18/+12
* | | | | Merge branch 'feature/svg-badge-template' into 'master' Douwe Maan2016-08-1010-100/+315
|\ \ \ \ \
| * | | | | Add missing space to generic badge templatefeature/svg-badge-templateGrzegorz Bizon2016-08-101-1/+1
| * | | | | Extend build badge specs to cover multiple pipelinesGrzegorz Bizon2016-08-091-14/+26
| * | | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-09102-641/+1219
| |\ \ \ \ \
| * | | | | | Improve indentation in svg badge templateGrzegorz Bizon2016-08-082-8/+19
| * | | | | | Improve builds badge specs, remove legacy methodsGrzegorz Bizon2016-08-082-40/+21
| * | | | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-08450-3708/+8621
| |\ \ \ \ \ \
| * | | | | | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-084-3/+8
| * | | | | | | Add badge template class to use with SVG ERB templateGrzegorz Bizon2016-07-282-0/+139
| * | | | | | | Calculate build status only in build badge classGrzegorz Bizon2016-07-282-17/+26
| * | | | | | | Extract build status badge metadata to separate classGrzegorz Bizon2016-07-285-49/+82
| * | | | | | | Add badge template to generic badge view templateGrzegorz Bizon2016-07-281-9/+9
| * | | | | | | Add generic SVG badge templateGrzegorz Bizon2016-07-281-0/+25
* | | | | | | | Update CHANGELOG for 8.10.5Rémy Coutable2016-08-101-2/+4
| |_|_|/ / / / |/| | | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \