summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | 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-198-38/+31
| * | | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-1911-76/+91
| |/ / / / / / / /
| * | | | | | | | 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-18470-2142/+15996
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix configure routeLuke "Jared" Bennett2016-12-172-3/+2
| * | | | | | | | | Incorporate reviewZ.J. van de Weg2016-12-164-21/+21
| * | | | | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-1613-104/+123
| * | | | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-166-33/+32
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-151-3/+5
| | * | | | | | | | | Improve session testsZ.J. van de Weg2016-12-153-45/+74
| | * | | | | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-122-0/+144
| * | | | | | | | | | Add auto configure of commandsZ.J. van de Weg2016-12-167-33/+50
| * | | | | | | | | | Add MattermostControllerZ.J. van de Weg2016-12-164-98/+159
| * | | | | | | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-1613-147/+259
| * | | | | | | | | | Improve session testsZ.J. van de Weg2016-12-163-45/+73
| * | | | | | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-162-0/+144
* | | | | | | | | | | 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-217-10/+83
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix reset pathfix/group-path-rename-errorJames Lopez2016-12-211-1/+1
| * | | | | | | | | | | added more specsJames Lopez2016-12-213-4/+8
| * | | | | | | | | | | 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-207-11/+83
* | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-12-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply margin on alert banners only when there is one or more alertsMike Greiling2016-12-201-2/+4
* | | | | | | | | | | | | Merge branch '25561-maintain-milestone-filter-param' into 'master' Fatih Acet2016-12-214-6/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Maintain milestone filter option when updating filter25561-maintain-milestone-filter-paramSam Rose2016-12-214-6/+99
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-copy-issues-empty-state' into 'master' Annabel Dunstone Gray2016-12-212-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Simplify copy in issues empty statefix-copy-issues-empty-statePedro Moreira da Silva2016-12-211-1/+1
| * | | | | | | | | | | | Add changelog for !8202.Pedro Moreira da Silva2016-12-201-0/+4
| * | | | | | | | | | | | Fix copy in Issue Tracker empty state.Pedro Moreira da Silva2016-12-201-2/+2
* | | | | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-212-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-212-5/+9
* | | | | | | | | | | | | Merge branch '25898-ci-icon-color-mr' into 'master' Jacob Schatz2016-12-212-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Adds CSS class to status icon on MR widget to prevent non-colored iconFilipa Lacerda2016-12-212-1/+5
* | | | | | | | | | | | | Merge branch 'dz-rename-invalid-groups' into 'master' Douwe Maan2016-12-213-2/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rename groups with .git in the end of the pathDmitriy Zaporozhets2016-12-213-2/+88
* | | | | | | | | | | | | | Merge branch 'dz-whitelist-dashboard-project-path' into 'master' Douwe Maan2016-12-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow projects with dashboard as pathDmitriy Zaporozhets2016-12-212-1/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-2110-3/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added support for Authentiq oauth providerAlex2016-12-2110-3/+91
* | | | | | | | | | | | | | | Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' Kamil Trzciński2016-12-213-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Ensure nil User-Agent doesn't break the CI APIRémy Coutable2016-12-213-1/+10
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'badge-color-on-white-bg' into 'master' Fatih Acet2016-12-2110-22/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-21546-4050/+15308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | fixed variable, plus added light text color for light badgesbadge-color-on-white-bgDimitrie Hoekstra2016-12-162-1/+3