summaryrefslogtreecommitdiff
path: root/app/views/shared
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '19620-auto-scroll-log' into 'master' Alfredo Sumaran2016-12-214-0/+12
|\
| * Renamed with `.svg`19620-auto-scroll-logKushal Pandya2016-12-214-0/+0
| * Embed SVG using `custom_icon`Kushal Pandya2016-12-214-0/+12
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+1
|\ \
| * \ Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-203-1/+3
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-203-18/+21
| |\ \ \
| * | | | Correct views for first iteration agreementLuke "Jared" Bennett2016-12-191-40/+39
| * | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-192-39/+41
| |\ \ \ \
| | * | | | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-172-39/+41
| | * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-38/+35
| | * | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-161-35/+38
* | | | | | Merge branch '25561-maintain-milestone-filter-param' into 'master' Fatih Acet2016-12-211-1/+1
|\ \ \ \ \ \
| * | | | | | Maintain milestone filter option when updating filter25561-maintain-milestone-filter-paramSam Rose2016-12-211-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-copy-issues-empty-state' into 'master' Annabel Dunstone Gray2016-12-211-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Simplify copy in issues empty statefix-copy-issues-empty-statePedro Moreira da Silva2016-12-211-1/+1
| * | | | | Fix copy in Issue Tracker empty state.Pedro Moreira da Silva2016-12-201-2/+2
* | | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-209-0/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-192-15/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-194-0/+40
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-161-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Add new borderless iconsFilipa Lacerda2016-12-159-0/+9
* | | | | | | | | Merge branch 'jej-fix-n+1-queries-milestones-show' into 'master' Sean McGivern2016-12-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix N+1 queries on milestone show pagesJames Edwards-Jones2016-12-201-1/+1
* | | | | | | | | Merge branch '25093-hide-new-issue-btn-non-loggedin-user' into 'master' Fatih Acet2016-12-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | hides new issue btn for now loggedin userNur Rony2016-12-191-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-201-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-191-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-201-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add terminal UI and controller actionsFatih Acet2016-12-191-0/+1
| |/ / / / / /
* | | | | | | Merge branch '25810-misaligned-count' into 'master' Fatih Acet2016-12-201-3/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Align milestone column header with count number25810-misaligned-countSam Rose2016-12-191-3/+5
| |/ / / / /
* | | | | | Bring back "notification-dropdown" class for styling and use "js-notification...leave-project-btnAdam Niedzielski2016-12-181-1/+1
* | | | | | Add sentence casing, fix groups page buttons, fix dark gray variableAnnabel Dunstone Gray2016-12-171-1/+1
* | | | | | Move all project buttons to headerAnnabel Dunstone Gray2016-12-172-2/+2
* | | | | | Move access request buttons to project headerAnnabel Dunstone Gray2016-12-171-14/+15
|/ / / / /
* | | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-171-0/+9
|\ \ \ \ \
| * | | | | add js prefix to classes used to toggle description on commit message in merg...Gabriel Gizotti2016-12-161-4/+4
| * | | | | extract duplicate logic into a variable on _commit_message_containerGabriel Gizotti2016-12-161-2/+3
| * | | | | move javascript code from _commit_message_container view to javascripts/merge...Gabriel Gizotti2016-12-161-21/+0
| * | | | | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-161-22/+18
| * | | | | only render MR description toggle javascript if description is availableGabriel Gizotti2016-12-161-20/+19
| * | | | | keep branch being merged, MR title and MR reference in merge commit message w...Gabriel Gizotti2016-12-161-2/+8
| * | | | | Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-161-0/+28
| | |_|_|/ | |/| | |
* | | | | Improve test for sort dropdown on members pageNur Rony2016-12-161-1/+1
* | | | | Remove unused id from shared members sort dropdownDouglas Barbosa Alexandre2016-12-161-1/+1
* | | | | Remove unnecessary curly braces from sort dropdown partialDouglas Barbosa Alexandre2016-12-161-1/+1
* | | | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-161-2/+0
* | | | | Adds sort dropdown for group membersNur Rony2016-12-161-0/+11
* | | | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-162-0/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-162-11/+18
View Lorry Controller Status