summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change tags order in refs dropdownfeature_change_sort_refsVitaliy @blackst0ne Klachkov2017-11-073-6/+12
|
* Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-068-61/+69
|\ | | | | | | | | Convert copy_as_gfm into ES module and move to behaviors See merge request gitlab-org/gitlab-ce!14859
| * fix broken reference to transformGFMSelectiones-module-copy_as_gfmMike Greiling2017-11-011-2/+3
| |
| * fix broken module importMike Greiling2017-11-011-1/+3
| |
| * remove global export except in test environmentsMike Greiling2017-11-015-56/+60
| |
| * move to copy_as_gfm to behaviors since it is invoked on every pageMike Greiling2017-11-013-3/+4
| |
* | Merge branch '34768-fix-issuable-header-wrapping' into 'master'Annabel Dunstone Gray2017-11-065-8/+32
|\ \ | | | | | | | | | | | | | | | | | | 34768 Fix problem with issuable header wrapping when content is too long Closes #34768 See merge request gitlab-org/gitlab-ce!15192
| * | 34768 Fix problem with issuable header wrapping when content is too long34768-fix-issuable-header-wrappingtauriedavis2017-11-035-8/+32
| | |
* | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'Clement Ho2017-11-065-11/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled Closes #20666 See merge request gitlab-org/gitlab-ce!15021
| * | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when ↵Jacopo2017-11-065-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issues are disabled The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now hidden when issues are disabled on the project.
* | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0671-1240/+2676
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879
| * | | | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory ↵refactor-clustersShinya Maeda2017-11-0616-207/+37
| | | | | | | | | | | | | | | | | | | | name. Use ArgumentError
| * | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0619-91/+303
| |\ \ \ \
| * | | | | Fix statis analysysShinya Maeda2017-11-051-1/+1
| | | | | |
| * | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-05241-1260/+1888
| |\ \ \ \ \
| * | | | | | Move migration file to post-migration. Use EachBatch. batch_size 1Shinya Maeda2017-11-043-103/+102
| | | | | | |
| * | | | | | Fix MigrateGcpClustersToNewClustersArchitectures. Improve specShinya Maeda2017-11-032-77/+169
| | | | | | |
| * | | | | | Fix import_export failureShinya Maeda2017-11-031-3/+4
| | | | | | |
| * | | | | | Fix spec failure. MySQL does not bite trueShinya Maeda2017-11-033-2/+7
| | | | | | |
| * | | | | | Merge branch 'master' into refactor-clustersEric Eastwood2017-11-0313-34/+85
| |\ \ \ \ \ \
| * | | | | | | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-036-8/+16
| | | | | | | |
| * | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-03252-1867/+2376
| |\ \ \ \ \ \ \
| * | | | | | | | Fix some testsShinya Maeda2017-11-039-288/+185
| | | | | | | | |
| * | | | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from ↵Shinya Maeda2017-11-027-71/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller. Use time_with_zone in schema. Remove Gcp::Clusters from safe_model_attributes.ym
| * | | | | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda2017-11-021-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into refactor-clusters
| | * | | | | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-02203-1987/+1962
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-019-42/+156
| | | | | | | | | |
| * | | | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument ↵Kamil Trzcinski2017-11-014-128/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KubernetesService
| * | | | | | | | | Improve migration file. Add migration spec. Reorder columns of the table.Shinya Maeda2017-11-015-105/+200
| | | | | | | | | |
| * | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-0112-48/+102
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-01635-6793/+11717
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | specs for featureShinya Maeda2017-11-0110-94/+165
| | | | | | | | | | |
| * | | | | | | | | | specs for controller. Improved validationShinya Maeda2017-10-3111-251/+446
| | | | | | | | | | |
| * | | | | | | | | | spec for spec/presentersShinya Maeda2017-10-311-6/+5
| | | | | | | | | | |
| * | | | | | | | | | specs for serializers.Shinya Maeda2017-10-312-18/+39
| | | | | | | | | | |
| * | | | | | | | | | specs for policies.Shinya Maeda2017-10-311-3/+3
| | | | | | | | | | |
| * | | | | | | | | | specs for workers.Shinya Maeda2017-10-314-55/+33
| | | | | | | | | | |
| * | | | | | | | | | specs for services. Improved details.Shinya Maeda2017-10-3021-388/+653
| | | | | | | | | | |
| * | | | | | | | | | specs for models. Improved details.Shinya Maeda2017-10-3016-342/+838
| | | | | | | | | | |
| * | | | | | | | | | This worksShinya Maeda2017-10-2324-219/+422
| | | | | | | | | | |
| * | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-2322-357/+592
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-0640-553/+1000
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all InfluxDB metrics to prometheus See merge request gitlab-org/gitlab-ce!13891
| * | | | | | | | | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643Pawel Chojnacki2017-11-031-12/+21
| | | | | | | | | | | |
| * | | | | | | | | | | Only enable unicorn metrics when not in sidekiq mode.Pawel Chojnacki2017-11-022-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + remove rebased test case
| * | | | | | | | | | | Make subscriber tests pass, after refactoring metricsPawel Chojnacki2017-11-026-11/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Use Mutex to guard metrics creation in transaction. Switch action view to ↵Pawel Chojnacki2017-11-022-28/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threadsafe instance variables
| * | | | | | | | | | | move metrics for ActiveRecord, RailsCache and queue duration to instance ↵Pawel Chojnacki2017-11-023-38/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables
| * | | | | | | | | | | rename BackgroundMigration to SidekiqMigrationPawel Chojnacki2017-11-026-4/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Fix sidekiq middleware testsPawel Chojnacki2017-11-025-27/+14
| | | | | | | | | | | |
View Lorry Controller Status