summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-218-90/+168
|\
| * Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2012-66/+129
| |\
| * \ 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
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2013-59/+151
| |\ \ \ | | |/ / | |/| |
| * | | Remove rest of the form parameters as we can't really support themKamil Trzcinski2016-12-202-14/+5
| * | | Improve sourcesKamil Trzcinski2016-12-194-20/+17
| * | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-191-0/+2
| |\ \ \
| * | | | kamil frontend review changesLuke "Jared" Bennett2016-12-194-54/+56
| * | | | 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-192-15/+24
| * | | | Correct views for first iteration agreementLuke "Jared" Bennett2016-12-195-58/+145
| * | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-196-148/+139
| |\ \ \ \
| | * | | | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-176-148/+139
| * | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1839-98/+187
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix configure routeLuke "Jared" Bennett2016-12-171-2/+1
| * | | | | Incorporate reviewZ.J. van de Weg2016-12-161-2/+0
| * | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-163-49/+47
| * | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-161-1/+2
| |\ \ \ \ \
| * | | | | | Add MattermostControllerZ.J. van de Weg2016-12-162-98/+106
| * | | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-164-144/+147
* | | | | | | 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 '25898-ci-icon-color-mr' into 'master' Jacob Schatz2016-12-211-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Adds CSS class to status icon on MR widget to prevent non-colored iconFilipa Lacerda2016-12-211-1/+1
* | | | | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-2174-233/+510
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Set “Remove branch” button to default sizeAlfredo Sumaran2016-12-211-1/+1
| * | | | | | | | remove button class size alteration from revert and cherry pick linksMike Greiling2016-12-211-2/+2
| * | | | | | | | Merge branch 'remove-u2f-error-logging' into 'master' Alfredo Sumaran2016-12-212-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Display error code for U2F errors (!7305)winniehell2016-11-072-2/+2
| * | | | | | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-2014-27/+55
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix broken testFilipa Lacerda2016-12-201-6/+4
| | * | | | | | | | | Adds tests for the mini pipeline graphFilipa Lacerda2016-12-201-2/+2
| | * | | | | | | | | Always show dropdownKamil Trzcinski2016-12-201-19/+12
| | * | | | | | | | | Resolve conflictFilipa Lacerda2016-12-191-6/+6
| | * | | | | | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1910-53/+49
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adds loading to improve UXFilipa Lacerda2016-12-192-8/+12
| | * | | | | | | | | | Makes API call when stage is clickedFilipa Lacerda2016-12-194-22/+11
| | * | | | | | | | | | Use group name for css classesFilipa Lacerda2016-12-191-2/+2
| | * | | | | | | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1921-52/+150
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+13
| | * | | | | | | | | | | Changes after reviewFilipa Lacerda2016-12-172-11/+7
| | * | | | | | | | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-169-31/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-163-8/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | CSS - Adds background color.Filipa Lacerda2016-12-152-13/+13