summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-092-4/+9
|\
| * Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-092-4/+9
* | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-092-2/+2
|\ \
| * | Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groupsTim Zallmann2017-10-092-2/+2
* | | Removes CommitsList from global namespaceFilipa Lacerda2017-10-092-26/+27
| |/ |/|
* | Merge branch 'abuse-reports-module' into 'master'Filipa Lacerda2017-10-093-6/+3
|\ \
| * | Convert AbuseReports class to a moduleabuse-reports-modulePhil Hughes2017-10-063-6/+3
* | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespaceFilipa Lacerda2017-10-096-34/+29
* | | Move cycle analytics banner into a vue fileFilipa Lacerda2017-10-092-0/+57
| |/ |/|
* | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-0721-922/+497
|\ \
| * | Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuffAnnabel Dunstone Gray2017-10-072-18/+18
| * | Specify gitlab navAnnabel Dunstone Gray2017-10-062-6/+6
| * | Finish combining nav stylesAnnabel Dunstone Gray2017-10-065-477/+412
| * | Fix specsAnnabel Dunstone Gray2017-10-062-0/+6
| * | Conflict fixesAnnabel Dunstone Gray2017-10-061-4/+4
| * | Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-0612-267/+75
| * | FixesAnnabel Dunstone Gray2017-10-065-129/+130
| * | Fix scrolling tabsAnnabel Dunstone Gray2017-10-062-0/+8
| * | Remove nav images; remove old nav styles; create new file for other navigatio...Annabel Dunstone Gray2017-10-069-525/+342
* | | Commenting on image diffsFelipe Artur2017-10-0729-74/+896
* | | Merge branch 'fl-38869-linked-tabs' into 'master'Mike Greiling2017-10-061-3/+0
|\ \ \
| * \ \ Merge branch 'master' into fl-38869-linked-tabsfl-38869-linked-tabsFilipa Lacerda2017-10-0634-108/+700
| |\ \ \ | | |/ /
| * | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classesFilipa Lacerda2017-10-061-3/+0
* | | | Merge branch '36255-metrics-that-do-not-have-a-complete-history-are-not-shown...Fatih Acet2017-10-062-1/+9
|\ \ \ \
| * | | | allow legend to properly handle NaN valuesMike Greiling2017-10-061-1/+5
| * | | | allow prometheus graphs to handle non-congiuous paths (with NaN, +Inf, and -Inf)Mike Greiling2017-10-061-0/+4
| | |/ / | |/| |
* | | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-067-7/+186
|/ / /
* | | Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-066-19/+62
|\ \ \
| * | | Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| * | | Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| * | | Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-052-3/+3
| * | | CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| * | | Removed the console.logTim Zallmann2017-10-051-1/+0
| * | | Refactored Highlighting mechanismTim Zallmann2017-10-054-16/+18
| * | | Optimising IfTim Zallmann2017-10-041-2/+2
| * | | Added Check for Line Number ElementTim Zallmann2017-10-041-1/+1
| * | | Fixed Repo Sidebar TestsTim Zallmann2017-10-041-29/+30
| * | | Fixed Eslint ErrorsTim Zallmann2017-10-041-4/+4
| * | | Polished Back Button for files that are not in the tree anymoreTim Zallmann2017-10-041-1/+10
| * | | Fixed Back Button for files + line number jumping for preview and editorTim Zallmann2017-10-044-7/+30
* | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-064-0/+126
|\ \ \ \
| * \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-077-11/+36
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-067-19/+100
| |\ \ \ \
| * | | | | Fix margins in edit formFilipa Lacerda2017-10-061-0/+4
| * | | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-0512-58/+99
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0544-299/+808
| |\ \ \ \ \ \
| * | | | | | | Changes after reviewFilipa Lacerda2017-10-041-3/+4
| * | | | | | | Adds Frontend specsFilipa Lacerda2017-10-041-10/+3
| * | | | | | | Adjustments to polling & formsFilipa Lacerda2017-10-041-44/+28
| * | | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-046-12/+18
| |\ \ \ \ \ \ \
View Lorry Controller Status