summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-20104-393/+645
|\
| * Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-206-61/+100
| |\
| | * Reduce duplication for GitHubish import status viewRémy Coutable2016-12-193-116/+63
| | * Modify GithubImport to support GiteaRémy Coutable2016-12-192-7/+6
| | * Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-195-29/+36
| | * Gogs ImporterKim "BKC" Carlbäcker2016-12-193-0/+86
| * | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-205-4/+28
| |\ \
| | * | Add terminal UI and controller actionsFatih Acet2016-12-195-0/+28
| | * | Remove unnecessary hidden svg elements for icons.Fatih Acet2016-12-191-4/+0
| | |/
| * | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-0/+93
| |\ \
| | * | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-181-0/+93
| | * | Fix specsKamil Trzcinski2016-12-161-3/+2
| | * | Create Slack Slash command serviceZ.J. van de Weg2016-12-161-1/+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
| | | |/ | | |/|
| * | | Merge branch 'leave-project-btn' into 'master' Fatih Acet2016-12-197-41/+37
| |\ \ \
| | * | | 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-172-2/+2
| | * | | Add empty koding state; check permissions for project buttonsAnnabel Dunstone Gray2016-12-173-13/+11
| | * | | Move all project buttons to headerAnnabel Dunstone Gray2016-12-177-25/+20
| | * | | Move access request buttons to project headerAnnabel Dunstone Gray2016-12-173-15/+18
| * | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-193-12/+12
| | |/ / | |/| |
| * | | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-192-3/+4
| |\ \ \
| | * | | Fix CI/CD statuses actions' CSS on pipeline graphsGrzegorz Bizon2016-12-171-1/+1
| | * | | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-161-2/+3
| * | | | Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-191-0/+2
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18271-1566/+2314
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Refactored JSLuke "Jared" Bennett2016-11-081-2/+2
| | * | | | Allow to use Dockerfile templatesKamil Trzcinski2016-11-081-0/+2
| * | | | | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' Kamil Trzciński2016-12-181-3/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-pathLuke "Jared" Bennett2016-12-151-3/+2
| * | | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-173-6/+24
| |\ \ \ \ \
| | * | | | | add js prefix to classes used to toggle description on commit message in merg...Gabriel Gizotti2016-12-161-4/+4
| | * | | | | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-5/+3
| | * | | | | better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| | * | | | | add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| | * | | | | 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-163-25/+21
| | * | | | | 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-162-0/+29
| | * | | | | better mentioned but not closing message and iconGabriel Gizotti2016-12-161-2/+2
| | * | | | | diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-161-0/+9
| * | | | | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-173-0/+11
| |\ \ \ \ \ \
| | * | | | | | 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-163-0/+13
View Lorry Controller Status