summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-016-7/+7
* Merge branch 'fix-feature-memoization' into 'master'Stan Hu2018-06-011-1/+4
* Merge branch '46913-appearance-uploader-fields-and-description-html-are-missi...Douwe Maan2018-06-011-9/+29
* Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master'Sean McGivern2018-06-012-2/+2
|\
| * Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-pluralMark Chao2018-05-312-2/+2
* | Merge branch 'ide-jobs-list-components' into 'master'Filipa Lacerda2018-06-0131-173/+860
|\ \
| * \ Merge branch 'master' into ide-jobs-list-componentside-jobs-list-componentsPhil Hughes2018-05-3139-261/+248
| |\ \
| * | | fixed jobs getting overwritten incorrectlyPhil Hughes2018-05-301-1/+1
| * | | changed mutation to return new arrayPhil Hughes2018-05-303-15/+29
| * | | changed mutations, update single object instead of returning new arrayPhil Hughes2018-05-305-38/+39
| * | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-3078-190/+332
| |\ \ \
| * | | | fixed failing specsPhil Hughes2018-05-301-1/+1
| * | | | removed style from components & moved to repo.scssPhil Hughes2018-05-295-92/+98
| * | | | more store testsPhil Hughes2018-05-291-1/+1
| * | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-2954-351/+1338
| |\ \ \ \
| * | | | | added component specsPhil Hughes2018-05-294-29/+37
| * | | | | added correct help path to empty statePhil Hughes2018-05-296-4/+18
| * | | | | added empty state & YAML error statePhil Hughes2018-05-297-9/+63
| * | | | | fixed height of header changing when expanding/collapsingPhil Hughes2018-05-251-0/+1
| * | | | | fixed scrolling issuesPhil Hughes2018-05-251-3/+18
| * | | | | fixed up after bootstrap upgradePhil Hughes2018-05-254-13/+21
| * | | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-25654-3062/+2885
| |\ \ \ \ \
| * | | | | | fixed mutations specPhil Hughes2018-05-251-2/+2
| * | | | | | added external link iconPhil Hughes2018-05-254-4/+38
| * | | | | | moved the collapsing method into a store actionPhil Hughes2018-05-256-30/+41
| * | | | | | fixed mutations specPhil Hughes2018-05-252-2/+9
| * | | | | | fixed pipeline actions specPhil Hughes2018-05-251-0/+1
| * | | | | | refactored to use data we already havePhil Hughes2018-05-2511-174/+69
| * | | | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-2521-66/+219
| |\ \ \ \ \ \
| * | | | | | | removed hacky $forceUpdatePhil Hughes2018-05-251-5/+0
| * | | | | | | spec fixesPhil Hughes2018-05-242-2/+6
| * | | | | | | removed need for jobs componentPhil Hughes2018-05-244-71/+54
| * | | | | | | improve design of job itemsPhil Hughes2018-05-248-23/+137
| * | | | | | | added job item componentPhil Hughes2018-05-242-9/+31
| * | | | | | | style improvementsPhil Hughes2018-05-2411-57/+163
| * | | | | | | improve API calls by calling internal API to get dataPhil Hughes2018-05-248-56/+137
| * | | | | | | added tab componentPhil Hughes2018-05-2413-16/+214
| * | | | | | | Added right sidebar componentsPhil Hughes2018-05-243-0/+113
* | | | | | | | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'm...Dmitriy Zaporozhets2018-06-0113-13/+221
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyt...Dmitriy Zaporozhets2018-05-304-4/+38
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyt...Dmitriy Zaporozhets2018-05-30734-3565/+4505
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix exception in clusters/applications_controller.rbDmitriy Zaporozhets2018-05-301-1/+1
| * | | | | | | | | | Rename clusters_applications_jupyters to uncountableDmitriy Zaporozhets2018-05-301-1/+1
| * | | | | | | | | | Refactor cluster app creation code in controllerDmitriy Zaporozhets2018-05-301-4/+5
| * | | | | | | | | | Changes after reviewFilipa Lacerda2018-05-283-3/+6
| * | | | | | | | | | Add some tests for jupyter app AR modelDmitriy Zaporozhets2018-05-251-2/+10
| * | | | | | | | | | Handle disabled button state in backendFilipa Lacerda2018-05-252-8/+2
| * | | | | | | | | | Don't allow jupyter install unless ingress external ip is assignedDmitriy Zaporozhets2018-05-252-0/+9
| * | | | | | | | | | Disables jupyter install button while ingress is not installedFilipa Lacerda2018-05-255-58/+32
| * | | | | | | | | | Add oauth reference to jupyter cluster appDmitriy Zaporozhets2018-05-252-4/+49