Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change tags order in refs dropdownfeature_change_sort_refs | Vitaliy @blackst0ne Klachkov | 2017-11-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'es-module-copy_as_gfm' into 'master' | Filipa Lacerda | 2017-11-06 | 4 | -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_gfm | Mike Greiling | 2017-11-01 | 1 | -2/+3 |
| | | |||||
| * | remove global export except in test environments | Mike Greiling | 2017-11-01 | 2 | -5/+11 |
| | | |||||
| * | move to copy_as_gfm to behaviors since it is invoked on every page | Mike Greiling | 2017-11-01 | 3 | -3/+4 |
| | | |||||
* | | Merge branch '34768-fix-issuable-header-wrapping' into 'master' | Annabel Dunstone Gray | 2017-11-06 | 4 | -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-wrapping | tauriedavis | 2017-11-03 | 4 | -8/+27 |
| | | | |||||
* | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master' | Clement Ho | 2017-11-06 | 2 | -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 ↵ | Jacopo | 2017-11-06 | 2 | -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 Bizon | 2017-11-06 | 26 | -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-clusters | Shinya Maeda | 2017-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | name. Use ArgumentError | ||||
| * | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 8 | -57/+18 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 51 | -694/+852 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into refactor-clusters | Eric Eastwood | 2017-11-03 | 9 | -33/+51 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix tests. Remove NOT NULL constraint from cluster.user. | Shinya Maeda | 2017-11-03 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 83 | -627/+728 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix some tests | Shinya Maeda | 2017-11-03 | 2 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from ↵ | Shinya Maeda | 2017-11-02 | 5 | -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 Maeda | 2017-11-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into refactor-clusters | ||||
| | * | | | | | | | | Pass cluster_id | Kamil Trzcinski | 2017-11-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 20 | -465/+513 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Revert back FetchKubernetesTokenService | Kamil Trzcinski | 2017-11-01 | 6 | -38/+88 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument ↵ | Kamil Trzcinski | 2017-11-01 | 3 | -126/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KubernetesService | ||||
| * | | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 2 | -6/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 177 | -2169/+3374 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | specs for feature | Shinya Maeda | 2017-11-01 | 4 | -13/+10 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | specs for controller. Improved validation | Shinya Maeda | 2017-10-31 | 4 | -15/+18 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | specs for workers. | Shinya Maeda | 2017-10-31 | 2 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | specs for services. Improved details. | Shinya Maeda | 2017-10-30 | 3 | -6/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | specs for models. Improved details. | Shinya Maeda | 2017-10-30 | 6 | -40/+47 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | This works | Shinya Maeda | 2017-10-23 | 19 | -162/+235 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform | Kamil Trzcinski | 2017-10-23 | 21 | -357/+526 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master' | Clement Ho | 2017-11-06 | 2 | -22/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix md form tab double click toggle Closes #39624 See merge request gitlab-org/gitlab-ce!15119 | ||||
| * | | | | | | | | | | | Fix karma | Luke "Jared" Bennett | 2017-11-02 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Separate preview and write tabs into seperate events | Luke "Jared" Bennett | 2017-11-02 | 2 | -24/+26 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix markdown-preview events for new isPreview var | Luke "Jared" Bennett | 2017-11-01 | 1 | -5/+12 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Let field.vue handle the changing of preview | Luke "Jared" Bennett | 2017-11-01 | 2 | -11/+11 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Dont emit toggle-markdown event if current target is already active and add ↵ | Luke "Jared" Bennett | 2017-11-01 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specs | ||||
* | | | | | | | | | | | | Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master' | Jacob Schatz | 2017-11-06 | 2 | -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 Firefox | Mike Greiling | 2017-11-06 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch '39757-border-zero-of-scss-lint' into 'master' | Annabel Dunstone Gray | 2017-11-06 | 39 | -100/+100 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable BorderZero rule in scss-lint Closes #39757 See merge request gitlab-org/gitlab-ce!15168 | ||||
| * | | | | | | | | | | | | Enable BorderZero rule in scss-lint | Takuya Noguchi | 2017-11-06 | 39 | -100/+100 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch '38589-internationalize-tags-page' into 'master' | Tim Zallmann | 2017-11-06 | 4 | -26/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Internationalize tags page" Closes #38589 See merge request gitlab-org/gitlab-ce!15165 | ||||
| * | | | | | | | | | | | | | consistency fixes38589-internationalize-tags-page | Jose Ivan Vargas | 2017-11-06 | 3 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Internationalized the tags page | Jose Ivan Vargas | 2017-11-06 | 4 | -26/+29 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master' | Sean McGivern | 2017-11-06 | 6 | -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 columns | micael.bergeron | 2017-11-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is an ActiveRecord extension and it should behave like one. I expected this to work. | ||||
| * | | | | | | | | | | | | | | ignore the column before the migration | micael.bergeron | 2017-11-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reword the changelog remove dead code in the specs | ||||
| * | | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers | micael.bergeron | 2017-11-03 | 5 | -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 Gray | 2017-11-06 | 9 | -196/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert unintentional changes in !12810 Closes #39816 See merge request gitlab-org/gitlab-ce!15198 |