summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Improve sourcesKamil Trzcinski2016-12-198-89/+72
* Last fixesZ.J. van de Weg2016-12-191-1/+1
* Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-197-2/+63
|\
| * Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-197-2/+63
| |\
| | * Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18919-8065/+15838
| | |\
| | * | Refactored JSLuke "Jared" Bennett2016-11-085-41/+50
| | * | Allow to use Dockerfile templatesKamil Trzcinski2016-11-086-2/+54
| * | | 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 remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-1911-115/+207
|\ \ \ \
| * | | | kamil frontend review changesLuke "Jared" Bennett2016-12-195-54/+60
| * | | | zj frontend reviewLuke "Jared" Bennett2016-12-192-4/+3
| * | | | Remove mock emoji commentsLuke "Jared" Bennett2016-12-191-5/+0
| * | | | Removed UI to show the registered team as its not yet possibleLuke "Jared" Bennett2016-12-191-4/+0
| * | | | UX review changesLuke "Jared" Bennett2016-12-193-16/+25
| * | | | Correct views for first iteration agreementLuke "Jared" Bennett2016-12-196-59/+146
| * | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-2/+2
* | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-192-16/+28
|/ / / /
* | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-198-148/+168
|\ \ \ \
| * | | | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-178-149/+169
* | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-18142-1018/+1853
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-1716-39/+39
| |\ \ \
| | * | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-1616-39/+39
| * | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-176-12/+79
| |\ \ \ \
| | * | | | Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-2/+1
| | * | | | add eslint disable prefix for prefer-arrow-callback rule on header of merge_r...Gabriel Gizotti2016-12-161-1/+1
| | * | | | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
| | * | | | add js prefix to classes used to toggle description on commit message in merg...Gabriel Gizotti2016-12-162-10/+10
| | * | | | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-162-11/+11
| | * | | | Unify commit message listeners in one functionGabriel Gizotti2016-12-161-11/+6
| | * | | | 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
| | * | | | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
| | * | | | move javascript code from _commit_message_container view to javascripts/merge...Gabriel Gizotti2016-12-162-21/+26
| | * | | | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-164-26/+23
| | * | | | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
| | * | | | 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
| | * | | | shorter lines on MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-2/+9
| | * | | | only look for issues mentioned on description on MergeRequest#issues_mentione...Gabriel Gizotti2016-12-161-2/+4
| | * | | | better mentioned but not closing message and iconGabriel Gizotti2016-12-162-9/+2
| | * | | | diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-162-0/+20
| | * | | | introduce MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-0/+16
| | * | | | Remove whole description from #merge_commit_message and add add closed issuesGabriel Gizotti2016-12-161-1/+2
| * | | | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-1710-13/+156
| |\ \ \ \ \
| | * | | | | Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-memberDouglas Barbosa Alexandre2016-12-161-2/+2
| | * | | | | Improve test for sort dropdown on members pageNur Rony2016-12-161-1/+1
| | * | | | | Fix sort dropdown alignmentNur Rony2016-12-161-2/+2
View Lorry Controller Status