summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0626-327/+539
|\
| * Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-061-1/+1
| * Merge branch 'master' into refactor-clustersShinya Maeda2017-11-068-57/+18
| |\
| * \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0551-694/+852
| |\ \
| * \ \ Merge branch 'master' into refactor-clustersEric Eastwood2017-11-039-33/+51
| |\ \ \
| * | | | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-031-0/+3
| * | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0383-627/+728
| |\ \ \ \
| * | | | | Fix some testsShinya Maeda2017-11-032-3/+2
| * | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-025-39/+28
| * | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i...Shinya Maeda2017-11-021-1/+1
| |\ \ \ \ \
| | * | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0220-465/+513
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-016-38/+88
| * | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-013-126/+41
| * | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-012-6/+12
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-01177-2169/+3374
| |\ \ \ \ \ \
| * | | | | | | specs for featureShinya Maeda2017-11-014-13/+10
| * | | | | | | specs for controller. Improved validationShinya Maeda2017-10-314-15/+18
| * | | | | | | specs for workers.Shinya Maeda2017-10-312-4/+4
| * | | | | | | specs for services. Improved details.Shinya Maeda2017-10-303-6/+7
| * | | | | | | specs for models. Improved details.Shinya Maeda2017-10-306-40/+47
| * | | | | | | This worksShinya Maeda2017-10-2319-162/+235
| * | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-2321-357/+526
* | | | | | | | Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-22/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix karmaLuke "Jared" Bennett2017-11-021-2/+2
| * | | | | | | | Separate preview and write tabs into seperate eventsLuke "Jared" Bennett2017-11-022-24/+26
| * | | | | | | | Fix markdown-preview events for new isPreview varLuke "Jared" Bennett2017-11-011-5/+12
| * | | | | | | | Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-012-11/+11
| * | | | | | | | Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-011-5/+11
* | | | | | | | | Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'Jacob Schatz2017-11-062-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix GPG signature popover trigger for Safari and FirefoxMike Greiling2017-11-062-2/+2
* | | | | | | | | | Merge branch '39757-border-zero-of-scss-lint' into 'master'Annabel Dunstone Gray2017-11-0639-100/+100
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Enable BorderZero rule in scss-lintTakuya Noguchi2017-11-0639-100/+100
* | | | | | | | | | Merge branch '38589-internationalize-tags-page' into 'master'Tim Zallmann2017-11-064-26/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | consistency fixes38589-internationalize-tags-pageJose Ivan Vargas2017-11-063-3/+3
| * | | | | | | | | | Internationalized the tags pageJose Ivan Vargas2017-11-064-26/+29
* | | | | | | | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-066-39/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-061-2/+2
| * | | | | | | | | | | ignore the column before the migrationmicael.bergeron2017-11-061-1/+2
| * | | | | | | | | | | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-035-36/+5
* | | | | | | | | | | | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert unintentional changes in !12810Takuya Noguchi2017-11-069-196/+101
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-3563...Sean McGivern2017-11-061-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639Pawel Chojnacki2017-09-251-7/+9
* | | | | | | | | | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-0615-22/+79
* | | | | | | | | | | | | Merge branch 'dm-block-group-and-project-creation-when-external-by-default' i...Sean McGivern2017-11-061-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make sure group and project creation is blocked for new users that are extern...Douwe Maan2017-11-061-3/+4
* | | | | | | | | | | | | | Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-061-0/+5
* | | | | | | | | | | | | | Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'Sean McGivern2017-11-068-58/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \