summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'Phil Hughes2018-08-102-4/+4
|\
| * Reduce differences between CE and EE code base in reports componentsFilipa Lacerda2018-08-102-4/+4
* | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master'Tim Zallmann2018-08-104-2/+116
|\ \ | |/ |/|
| * port changesLuke Bennett2018-08-072-5/+1
| * Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements'Luke Bennett2018-08-06149-1168/+2488
| |\
| * | Review changesLuke Bennett2018-08-031-5/+18
| * | Fix settings.scssLuke Bennett2018-08-021-4/+0
| * | re-portLuke Bennett2018-08-025-8/+34
| * | Remove debuggerLuke Bennett2018-07-251-2/+0
| * | portLuke Bennett2018-07-253-1/+86
* | | Merge branch '49375-move-reports-code' into 'master'Phil Hughes2018-08-0911-16/+14
|\ \ \
| * | | Moves report components to reports folderFilipa Lacerda2018-08-0711-16/+14
* | | | Add default avatar to groupGeorge Tsiolis2018-08-092-4/+1
* | | | Merge branch 'ide-open-empty-merge-request' into 'master'Filipa Lacerda2018-08-092-4/+5
|\ \ \ \
| * | | | removed un-used commits for currentProject & currentBranchIdPhil Hughes2018-08-091-3/+0
| * | | | Allow the Web IDE to open empty merge requestsPhil Hughes2018-08-091-1/+5
* | | | | Fix label item height when no descLuke Bennett2018-08-091-1/+2
|/ / / /
* | | | Porting MR Vue Memory Fixes to current masterTim Zallmann2018-08-0814-83/+195
* | | | Resolve "Group dashboard > Line height is too tall for group names"Adriel Santiago2018-08-073-55/+75
* | | | Merge branch 'winh-restyle-user-status' into 'master'Mike Greiling2018-08-076-22/+131
|\ \ \ \
| * | | | Restyle status message input on profile settingsWinnie Hellmann2018-08-076-22/+131
| | |_|/ | |/| |
* | | | Resolve "Board label edit drop down is showing incorrect selected labels summ...Constance Okoghenun2018-08-073-5/+27
* | | | Fix UI error whereby prometheus application status is updatedClement Ho2018-08-074-33/+39
* | | | Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-072-4/+26
* | | | Merge branch 'ide-fixed-height-sidebar' into 'master'Filipa Lacerda2018-08-071-1/+1
|\ \ \ \
| * | | | Fixed the height of the tree list in the Web IDEPhil Hughes2018-08-071-1/+1
* | | | | Create Web IDE MR and branch pickerPaul Slaughter2018-08-0728-218/+736
| |_|/ / |/| | |
* | | | Merge branch 'kp-6927-epic-dates-from-milestone' into 'master'Phil Hughes2018-08-071-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Add `tabindex` attribute support to show BS4 popover on trigger `focus`Kushal Pandya2018-08-071-0/+7
* | | | Merge branch 'ide-codesandbox-poc' into 'master'Filipa Lacerda2018-08-0711-8/+418
|\ \ \ \
| * | | | Web IDE & CodeSandboxPhil Hughes2018-08-0711-8/+418
* | | | | Merge branch '49966-improve-junit-fe' into 'master'Phil Hughes2018-08-072-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reset error state in success mutation to handle error-success stateFilipa Lacerda2018-08-071-0/+2
| * | | | Show resolved failuresFilipa Lacerda2018-08-071-1/+1
* | | | | Web IDE context header redesignPaul Slaughter2018-08-079-198/+163
|/ / / /
* | | | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-075-1/+133
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-025-1/+133
* | | | Merge branch '49854-recover-mr-regression-fixes-safe' into 'master'Tim Zallmann2018-08-0712-77/+197
|\ \ \ \
| * | | | Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'mast...André Luís2018-08-015-40/+142
| * | | | Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-015-33/+55
| * | | | Reapply "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-4/+0
* | | | | Resolve "System level labels UI broken"André Luís2018-08-071-0/+78
* | | | | Resolve "Frontend for clarifying the usefulness of the search bar"Dennis Tang2018-08-075-407/+551
* | | | | Send resize parameters for avatarsTim Zallmann2018-08-072-5/+18
* | | | | Update CreateItemDropdown class to allow the glDropdown filterRemote optionMike Greiling2018-08-062-2/+4
* | | | | Resolve "Improve Auto DevOps settings flow for admin and project"Mike Greiling2018-08-062-15/+5
* | | | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-061-2/+15
|\ \ \ \ \
| * | | | | Simplify importer_status.js failed status implementationStan Hu2018-08-061-3/+2
| * | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-3112-42/+98
| |\ \ \ \ \
| * | | | | | Fix Karma failures due to invalid icon namesStan Hu2018-07-272-2/+2
View Lorry Controller Status