summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-068-62/+142
|\
| * fixed misaligned iconPhil Hughes2018-07-061-1/+1
| * updated iconPhil Hughes2018-07-051-1/+1
| * fixed where the scrollbar is shown in the merge request panelPhil Hughes2018-07-052-4/+7
| * component specPhil Hughes2018-07-051-0/+2
| * tidy up componentPhil Hughes2018-07-052-34/+9
| * only include _html fields when asked forPhil Hughes2018-07-053-5/+5
| * added html to responsePhil Hughes2018-07-051-2/+2
| * update designPhil Hughes2018-07-051-33/+12
| * :sparkles: use pre-existing components for title and descriptionPhil Hughes2018-07-052-70/+70
| * Added merge request info to Web IDE sidebarPhil Hughes2018-07-053-1/+122
* | Resolve "MRs are showing some discussions as unresolved"Simon Knox2018-07-051-2/+2
|/
* Web Terminal Ci BuildFrancisco Javier López2018-07-051-0/+3
* Improves performance on MR refactor and adds specsFilipa Lacerda2018-07-053-94/+104
* File Icons in Merge RequestsTim Zallmann2018-07-052-6/+10
* Resolve "When editing a comment in an issue, the preview mode is toggled in t...Constance Okoghenun2018-07-051-2/+2
* Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into 'mas...Phil Hughes2018-07-054-5/+89
|\
| * populate environments dropdown, add testsJose2018-07-044-16/+48
| * Add environments endpoint, also added store and service capabilities for said...Jose2018-07-033-6/+29
| * Add dropdown, without dataJose2018-07-032-1/+30
* | Merge branch 'ce-5787-extract-ee-boards' into 'master'Phil Hughes2018-07-056-37/+93
|\ \
| * | Port of EE refactoring to extract EE lines from boardsPaul Slaughter2018-07-036-37/+93
| |/
* | Fix ESLint for app/assets/javascripts/pages/projects/index.jsWinnie Hellmann2018-07-041-1/+1
* | Merge branch '45739-add-metrics-to-operations-tab' into 'master'Filipa Lacerda2018-07-041-0/+1
|\ \
| * | Fix metrics shortcutJose2018-06-261-0/+1
* | | Merge branch '19468-add_readme_when_creating_project' into 'master'Douwe Maan2018-07-041-0/+16
|\ \ \
| * | | Add option to add README when creating a projectImre Farkas2018-07-041-0/+16
* | | | Merge branch '43446-new-cluster-page-tabs' into 'master'Kamil Trzciński (OoO till 3th)2018-07-043-6/+14
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-2183-108/+118
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-19438-2251/+4802
| |\ \ \ \ \
| * | | | | | Update index.jsDennis Tang2018-06-191-1/+5
| * | | | | | consolidate back into one controllerDennis Tang2018-06-192-5/+6
| * | | | | | split into gcp and user controllers againDennis Tang2018-06-052-6/+5
| * | | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-041-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-0154-201/+1219
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-318-49/+42
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Remove links from Web IDE unexpectedly navigate you to a different p...Sam Beckham2018-05-313-87/+44
| * | | | | | | | | Remove whitespaceFilipa Lacerda2018-05-311-1/+1
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-3149-318/+395
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | update view name for gke dropdown checkDennis Tang2018-05-261-1/+1
| * | | | | | | | | | enable new gke dropdownsDennis Tang2018-05-261-3/+2
| * | | | | | | | | | combine "create" and "existing" GKE cluster views into one new pageDennis Tang2018-05-263-6/+11
* | | | | | | | | | | Merge branch 'ee-5481-epic-todos' into 'master'Sean McGivern2018-07-045-1/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add fill color for sidebar todo iconKushal Pandya2018-07-041-0/+1
| * | | | | | | | | | | Add Group filter dropdown supportKushal Pandya2018-07-042-1/+27
| * | | | | | | | | | | Add custom cssClasses supportKushal Pandya2018-07-041-0/+7
| * | | | | | | | | | | Sidebar Todo ComponentKushal Pandya2018-07-041-0/+98
* | | | | | | | | | | | Merge branch 'ide-even-more-improved-errors' into 'master'Filipa Lacerda2018-07-043-20/+76
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fixed karmaPhil Hughes2018-07-031-1/+2
| * | | | | | | | | | | | karma fixesPhil Hughes2018-07-031-1/+1
View Lorry Controller Status