summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-112-3/+3
|/ /
* | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-091-4/+0
|\ \ \ \ \ \
| * | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-041-4/+0
| | |_|/ / / | |/| | | |
* | | | | | 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 'patch-3' into 'master' Achilleas Pipinellis2016-08-081-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!"Jeffrey Lin2016-08-081-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'branch-permissions' into 'master' Jacob Schatz2016-08-085-75/+76
|\ \ \ \ \
| * | | | | Set for for labels and ID for dropdowns on create formAlfredo Sumaran2016-08-051-5/+5
| * | | | | Fix .panel-title styleAlfredo Sumaran2016-08-052-2/+4
| * | | | | Fix spelling. `braches` to `branches`Alfredo Sumaran2016-08-051-1/+1
| * | | | | Prevent setting HTML directly from the JSAlfredo Sumaran2016-08-051-1/+2
| * | | | | Add url to Wildcard protected branches documentationAlfredo Sumaran2016-08-051-1/+2
| * | | | | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-2/+2
| * | | | | Fix class names and move each class to its own fileAlfredo Sumaran2016-08-051-5/+7
| * | | | | Refactor of Protected Branch Edit ListAlfredo Sumaran2016-08-051-8/+7
| * | | | | Update layout and JS for create protected branch.Alfredo Sumaran2016-08-055-68/+64
| |/ / / /
* | | | | Merge branch 'master' into 18256-secret-token-docsSteve Halasz2016-08-0517-44/+52
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-051-1/+1
| |\ \ \ \