summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Change tags order in refs dropdownfeature_change_sort_refsVitaliy @blackst0ne Klachkov2017-11-071-1/+1
|
* Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-064-9/+17
|\ | | | | | | | | 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
| |
| * remove global export except in test environmentsMike Greiling2017-11-012-5/+11
| |
| * 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-064-8/+27
|\ \ | | | | | | | | | | | | | | | | | | 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-034-8/+27
| | |
* | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'Clement Ho2017-11-062-3/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-062-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0626-327/+539
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-061-1/+1
| | | | | | | | | | | | | | | | | | | | name. Use ArgumentError
| * | | | 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 ↵Shinya Maeda2017-11-025-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0220-465/+513
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-016-38/+88
| | | | | | | | | |
| * | | | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument ↵Kamil Trzcinski2017-11-013-126/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KubernetesService
| * | | | | | | | | 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 md form tab double click toggle Closes #39624 See merge request gitlab-org/gitlab-ce!15119
| * | | | | | | | | | | 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 ↵Luke "Jared" Bennett2017-11-011-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specs
* | | | | | | | | | | | Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'Jacob Schatz2017-11-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GPG tooltips not working in Safari" Closes #38385 See merge request gitlab-org/gitlab-ce!15228
| * | | | | | | | | | | | 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-lint Closes #39757 See merge request gitlab-org/gitlab-ce!15168
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Internationalize tags page" Closes #38589 See merge request gitlab-org/gitlab-ce!15165
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
| * | | | | | | | | | | | | | updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is an ActiveRecord extension and it should behave like one. I expected this to work.
| * | | | | | | | | | | | | | ignore the column before the migrationmicael.bergeron2017-11-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reword the changelog remove dead code in the specs
| * | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-035-36/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
* | | | | | | | | | | | | | | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert unintentional changes in !12810 Closes #39816 See merge request gitlab-org/gitlab-ce!15198