summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-152-24/+28
|\
| * Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-152-24/+28
| |\
| | * Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| | * Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| | * Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-151-24/+28
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-153-5/+26
|\ \ \ | |/ /
| * | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-151-0/+13
| |\ \
| | * | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-121-3/+6
| | * | CI build status not per environmentZ.J. van de Weg2016-08-111-19/+17
| | * | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-2/+2
| | * | Show deployment status on a MR viewZ.J. van de Weg2016-08-111-14/+26
| * | | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-151-5/+11
| | |/ | |/|
| * | Add archived badge to project listingDrew Blessing2016-08-121-0/+2
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-136-12/+22
|\ \ \ | |/ /
| * | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-126-12/+22
| |\ \
| | * | Add gravatars to build history20059-environment-listAnnabel Dunstone2016-08-083-3/+4
| | * | Add deployment ID and gravatar to environments pageAnnabel Dunstone2016-08-083-4/+8
| | * | Format environment history pageAnnabel Dunstone2016-08-081-2/+2
| | * | Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-083-7/+12
| | * | Style deploy buttonAnnabel Dunstone2016-08-081-3/+3
* | | | Capitalise URL on web_hooks/formKamil Trzcinski2016-08-121-8/+8
* | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-123-5/+5
|\ \ \ \ | |/ / /
| * | | render only commit titleubudzisz2016-08-111-1/+1
| | |/ | |/|
| * | Merge branch '20614-show-member-roles-to-all-users' into 'master' Robert Speicher2016-08-111-1/+1
| |\ \
| | * | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-111-1/+1
| * | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-111-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-111-3/+3
* | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-112-3/+3
|\ \ \ \ | |/ / /
| * | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-112-3/+3
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1145-189/+221
|\ \ \ | |/ /
| * | Merge branch 'cs-remove-inline-js' into 'master' Fatih Acet2016-08-102-6/+0
| |\ \
| | * | Removes two simple instances of inline JavaScript.Connor Shea2016-07-262-6/+0
| * | | Merge branch 'explicit-arguments-on-diff_file_html_data' into 'master' Yorick Peterse2016-08-101-1/+1
| |\ \ \
| | * | | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-1/+1
| * | | | Merge branch 'feature/svg-badge-template' into 'master' Douwe Maan2016-08-101-0/+36
| |\ \ \ \
| | * | | | Add missing space to generic badge templatefeature/svg-badge-templateGrzegorz Bizon2016-08-101-1/+1
| | * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-097-77/+80
| | |\ \ \ \
| | * | | | | Improve indentation in svg badge templateGrzegorz Bizon2016-08-081-7/+18
| | * | | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0858-225/+261
| | |\ \ \ \ \
| | * | | | | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-1/+1
| | * | | | | | Add badge template to generic badge view templateGrzegorz Bizon2016-07-281-9/+9
| | * | | | | | Add generic SVG badge templateGrzegorz Bizon2016-07-281-0/+25
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix-filter-label-tooltip' into 'master' Fatih Acet2016-08-101-5/+1
| |\ \ \ \ \ \
| | * | | | | | Fix filter label tooltip HTML renderingClement Ho2016-08-041-5/+1
| * | | | | | | Used cached value of project count to reduce DB loadRémy Coutable2016-08-101-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | 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 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-091-0/+6
| |\ \ \ \ \ \
| | * | | | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-091-0/+6
| | | |_|_|/ / | | |/| | | |
View Lorry Controller Status