summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25368-fix-left-align-system-note' into 'master' Alfredo Sumaran2016-12-211-2/+6
|\
| * fixes left align issue for long system notesNur Rony2016-12-211-2/+6
* | Merge branch 'dz-whitelist-more-project-names' into 'master' Douwe Maan2016-12-211-1/+1
|\ \
| * | Whitelist next project names: help, ci, admin, searchdz-whitelist-more-project-namesDmitriy Zaporozhets2016-12-211-1/+1
* | | Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master' Jacob Schatz2016-12-211-6/+0
|\ \ \
| * | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerlyLuke "Jared" Bennett2016-12-211-6/+0
| | |/ | |/|
* | | Merge branch 'minor-pipeline-graph-beautyfixes' into 'master' Fatih Acet2016-12-212-26/+46
|\ \ \
| * | | pipeline css changesminor-pipeline-graph-beautyfixesdimitrieh2016-12-212-26/+46
| |/ /
* | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil TrzciƄski2016-12-2112-90/+270
|\ \ \
| * | | Improve API specsKamil Trzcinski2016-12-211-3/+3
| * | | Fix a few error messagesKamil Trzcinski2016-12-201-0/+9
| * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-3/+3
| |\ \ \
| | * | | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-3/+3
| * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2043-198/+842
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-3/+6
| |\ \ \ \
| | * | | | Pedro copy changesLuke "Jared" Bennett2016-12-201-3/+6
| * | | | | WIPKamil Trzcinski2016-12-204-24/+17
| * | | | | Work on tests for mattermostKamil Trzcinski2016-12-201-4/+4
| * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2037-185/+343
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Remove rest of the form parameters as we can't really support themKamil Trzcinski2016-12-202-14/+5
| * | | | | Fix flowKamil Trzcinski2016-12-202-7/+5
| * | | | | 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 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix configure routeLuke "Jared" Bennett2016-12-171-2/+1
| * | | | | | | Incorporate reviewZ.J. van de Weg2016-12-163-9/+21
| * | | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-165-88/+47
| * | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-163-15/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Add auto configure of commandsZ.J. van de Weg2016-12-163-19/+8
| * | | | | | | | Add MattermostControllerZ.J. van de Weg2016-12-163-98/+153
| * | | | | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-168-145/+206
* | | | | | | | | Merge branch '25897-textarea-stops-accepting-space-and-return-characters-with...Fatih Acet2016-12-211-7/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed hack25897-textarea-stops-accepting-space-and-return-characters-with-no-warningLuke "Jared" Bennett2016-12-211-7/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-213-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix reset pathfix/group-path-rename-errorJames Lopez2016-12-211-1/+1
| * | | | | | | | | added more specsJames Lopez2016-12-211-0/+2
| * | | | | | | | | update controller action to render error in formJames Lopez2016-12-211-4/+1
| * | | | | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-203-4/+13