summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-075-3/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-075-3/+28
| |/ / / /
* | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-071-1/+1
|\ \ \ \ \
| * | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-051-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \ \
| * | | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-078-89/+411
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-064-64/+8
| * | | | Add persistent flash messagesJose Ivan Vargas2018-03-014-2/+58
| * | | | Changed selector names, address code concernsJose Ivan Vargas2018-03-016-149/+159
| * | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-018-87/+399
* | | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-076-2/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-066-2/+8
* | | | | Remove common_vue bundleMike Greiling2018-03-061-0/+1
|/ / / /
* | | | Merge branch 'ce-3727-fe-labels-for-epics' into 'master'Filipa Lacerda2018-03-062-3/+3
|\ \ \ \
| * | | | Add `js-*` class to refer in JSKushal Pandya2018-03-062-3/+3
* | | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-069-61/+170
|\ \ \ \ \
| * | | | | move misplaced entry pointcluster-monitoring-changes-ce-backportMike Greiling2018-03-061-0/+0
| * | | | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-062-5/+9
| * | | | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| * | | | | remove prometheus panel styling on cluster monitoring pageMike Greiling2018-03-062-1/+21
| * | | | | lighten axis tick textMike Greiling2018-03-061-1/+2
| * | | | | add ability to override graph size measurementsMike Greiling2018-03-062-1/+12
| * | | | | fix spacing around axis label text in small breakpointsMike Greiling2018-03-061-2/+3
| * | | | | hide legend without hiding the axis labelsMike Greiling2018-03-062-35/+42
| * | | | | add option to hide the graph legendMike Greiling2018-03-062-1/+15
| * | | | | use proper dependency injection for monitoring dashboard componentMike Greiling2018-03-062-21/+66
| * | | | | make deployments endpoint optionalMike Greiling2018-03-061-0/+3
| * | | | | add prometheus cluster health monitoring empty stateMike Greiling2018-03-061-1/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0613-54/+268
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0684-3845/+915
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Bring one group board to CEFelipe Artur2018-03-0313-54/+268
* | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-06216-4983/+3142
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage"Shah El-Rahman2018-03-061-5/+5
| * | | | | Merge branch '38587-pipelines-empty-state' into 'master'Phil Hughes2018-03-068-220/+300
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Changes after review38587-pipelines-empty-stateFilipa Lacerda2018-03-055-14/+8
| | * | | | [ci skip] Merge branch 'master' into 38587-pipelines-empty-stateFilipa Lacerda2018-03-0513-4/+561
| | |\ \ \ \
| | * | | | | Fix broken empty tab stateFilipa Lacerda2018-03-051-1/+1
| | * | | | | Manage empty states in Pipelines pageFilipa Lacerda2018-03-059-218/+304
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-051-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | CI/CD-only projects FEEric Eastwood2018-03-051-2/+2
| * | | | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-0512-4/+558
| |\ \ \ \ \
| | * | | | | LabelsSelect DropdownValueCollapsed ComponentKushal Pandya2018-03-051-0/+48
| | * | | | | LabelsSelect DropdownValue ComponentKushal Pandya2018-03-051-0/+63
| | * | | | | LabelsSelect DropdownTitle ComponentKushal Pandya2018-03-051-0/+30
| | * | | | | LabelsSelect DropdownSearchInput ComponentKushal Pandya2018-03-051-0/+27
| | * | | | | LabelsSelect DropdownHiddenInput ComponentKushal Pandya2018-03-051-0/+22
| | * | | | | LabelsSelect DropdownHeader ComponentKushal Pandya2018-03-051-0/+21
| | * | | | | LabelsSelect DropdownFooter ComponentKushal Pandya2018-03-051-0/+34
| | * | | | | LabelsSelect DropdownCreateLabel ComponentKushal Pandya2018-03-051-0/+84