Commit Graph

1906 Commits

Author SHA1 Message Date
Simon Knox f8efaf1bf8 issue note store 2017-11-30 22:44:41 +00:00
Fatih Acet bfac8b7aba Merge branch 'improve-require-input-spec' into 'master'
Improve require input spec

See merge request gitlab-org/gitlab-ce!15654
2017-11-30 22:02:51 +00:00
Phil Hughes cf26f27d98
updated diff spec 2017-11-30 10:01:26 +00:00
Phil Hughes 386cbf22ee
Merge branch 'master' into multi-file-editor-dirty-diff-indicator 2017-11-30 09:52:58 +00:00
Clement Ho bf0bbd7b2a Improve require input spec 2017-11-29 12:02:27 -06:00
Tim Zallmann f57b06ca83 Merge branch 'multi-file-editor-css-fixes' into 'master'
Added IDE commit panel

Closes #40041

See merge request gitlab-org/gitlab-ce!15583
2017-11-29 10:40:20 +00:00
Kushal Pandya ebf22493b5 Fix item name and namespace text overflow in Projects dropdown 2017-11-29 10:35:41 +00:00
Phil Hughes 1880809d8e
added editor options to redcue EE conflicts 2017-11-29 10:26:35 +00:00
Sean McGivern f3ac2e56e7 Merge branch '21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master'
Resolve "Customize branch name when using create branch in an issue"

Closes #21143

See merge request gitlab-org/gitlab-ce!13884
2017-11-29 10:01:05 +00:00
Fatih Acet 673c4ccbc8 Merge branch 'remove-iife-autosize' into 'master'
Improve autosize spec

See merge request gitlab-org/gitlab-ce!15620
2017-11-29 09:51:59 +00:00
Fatih Acet e74ef3acea Merge branch 'backport-border-inline-edit' into 'master'
Backport - Add border for epic edit button

See merge request gitlab-org/gitlab-ce!15637
2017-11-29 09:43:25 +00:00
Clement Ho 52eac5bb0e Backport epic tasklist 2017-11-29 09:29:06 +00:00
Kamil Trzciński 99d143fb2e Merge branch '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master'
Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings

Closes #38962

See merge request gitlab-org/gitlab-ce!15380
2017-11-28 20:09:27 +00:00
Clement Ho 27d64f5baa Backport border inline edit 2017-11-28 13:14:46 -06:00
Eric Eastwood ac87bd0c11 Add checkboxes to automatically run AutoDevops pipeline
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
2017-11-28 12:43:43 -06:00
Phil Hughes d22bb0397b
fixed failing specs 2017-11-28 16:51:37 +00:00
Phil Hughes 061be86e05
added specs 2017-11-28 14:43:47 +00:00
Tim Zallmann 6b0f594c00 Merge branch 'icon-sizes' into 'master'
limit icon component size to valid values

See merge request gitlab-org/gitlab-ce!15618
2017-11-28 09:42:24 +00:00
Clement Ho cd9c75960c Remove iife and eslint disable 2017-11-27 17:13:11 -06:00
Fatih Acet 04ceeac1f6 Merge branch 'backport-epic-fullscreen' into 'master'
Backport epic fullscreen

See merge request gitlab-org/gitlab-ce!15437
2017-11-27 20:35:18 +00:00
Fatih Acet f8de23e626 Merge branch 'backport-add-epic-sidebar' into 'master'
Backport of add-epic-sidebar

See merge request gitlab-org/gitlab-ce!15335
2017-11-27 20:21:53 +00:00
Simon Knox 539ea5ebda limit icon component size to valid values 2017-11-28 06:40:13 +11:00
Vitaliy @blackst0ne Klachkov 5bc32b65f1 Add an ability to use a custom branch name on creation from issues 2017-11-25 22:33:05 +11:00
Phil Hughes e9c7015203
fixed rspec
added getter specs
2017-11-24 15:55:08 +00:00
Phil Hughes 8f7ec95b86
added specs
fixed scss-lint
2017-11-24 15:55:08 +00:00
Filipa Lacerda d22c885743 Merge branch 'fix-mermaid-import' into 'master'
Fixed import of render mermaid & render math methods

See merge request gitlab-org/gitlab-ce!15550
2017-11-23 15:47:17 +00:00
Filipa Lacerda 4563156256 Improve environments performance 2017-11-23 12:04:03 +00:00
Clement Ho 880c9a2c78 Backport fix epic fullscreen 2017-11-22 17:20:23 -06:00
Phil Hughes ffd7fbf53b
moved to es6 modules 2017-11-22 18:51:06 +00:00
Filipa Lacerda 48b65bb0ef Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master'
Replace vue-resource for axios in the Prometheus Dashboard

See merge request gitlab-org/gitlab-ce!15547
2017-11-22 18:17:43 +00:00
Jose Ivan Vargas e673730079 Replaced vue-resource for axios in the prometheus dashboard 2017-11-22 10:52:14 -06:00
Phil Hughes d7527d73b1 Merge branch 'feature_add_mermaid' into 'master'
Add support of Mermaid

Closes #3711

See merge request gitlab-org/gitlab-ce!15107
2017-11-22 11:00:12 +00:00
Vitaliy @blackst0ne Klachkov 131e74d10d Add support of Mermaid 2017-11-22 14:12:04 +11:00
Phil Hughes 15cb13ee87 Merge branch '38869-milestone' into 'master'
Export code as ES6 modules

See merge request gitlab-org/gitlab-ce!15503
2017-11-21 10:45:23 +00:00
Clement Ho eb5333970c Backport ability to enable/disable file attachments in issuable form 2017-11-21 09:39:57 +00:00
Filipa Lacerda 030de8b328
Export code as ES6 modules 2017-11-20 20:28:29 +00:00
Eric Eastwood f494dbc515 Async notification subscriptions in issue boards 2017-11-20 12:38:53 -02:00
Filipa Lacerda 9400ed3b3e Use axios instead of vue resource - step 1 2017-11-20 09:57:08 +00:00
Grzegorz Bizon 128cb03bc8 Merge branch 'rc/use-existing-url-helper' into 'master'
Replace ci_status_path with pipeline_path

See merge request gitlab-org/gitlab-ce!15369
2017-11-17 09:25:19 +00:00
Luke "Jared" Bennett d0f7e4df34 Resolve "lock/confidential issuable sidebar custom svg icons iteration" 2017-11-16 16:44:16 +00:00
Clement Ho c6c493a730 Backport delete epic changes 2017-11-15 17:13:20 -06:00
Clement Ho cd0ae8541c Merge branch 'master' into 'backport-add-epic-sidebar'
# Conflicts:
#   app/assets/javascripts/lib/utils/text_utility.js
2017-11-15 22:23:10 +00:00
Mike Greiling 2f74b1d323 Merge branch '39861-follow-up-from-enable-multiple-queries-per-prometheus-graph' into 'master'
Resolve "Follow-up from "Enable multiple queries per Prometheus graph""

Closes #39861

See merge request gitlab-org/gitlab-ce!15363
2017-11-15 20:20:55 +00:00
Filipa Lacerda 0f5faea404 Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'
Update Emoji digests and assets with latest from Gemojione v3.3.0

Closes #32634

See merge request gitlab-org/gitlab-ce!15390
2017-11-15 18:08:25 +00:00
Phil Hughes 068f9df2bd Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' into 'master'
Remove approvals when in empty MR widget state -- CE backport

See merge request gitlab-org/gitlab-ce!15362
2017-11-15 09:00:27 +00:00
Eric Eastwood 9e5db3e261 Add rainbow_flag to emoji support map
Tested on the following platforms that split the emoji into separate
characters currently.
 - Windows 10 FCU
    - Chrome 62.0.3202.89
    - Firefox 57.0b14
    - MS Edge 41.16299.15.0
 - macOS 10.12.6
    - Chrome 63.0.3239.40
    - Safari 11.0.1 (12604.3.5.1.1)
    - Firefox 57.0
 - Ubuntu 16.04
    - Chromium 62.0.3202.75
    - Firefox 56.0
2017-11-15 01:54:52 -06:00
Filipa Lacerda be4abe7719 Stops page reload when changing tabs or pages - uses API requests instead 2017-11-14 15:35:29 +00:00
Rémy Coutable 6ae4747673 Replace ci_status_path with pipeline_path
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-14 12:45:43 +01:00
Jose Ivan Vargas b49fab4c2b Add missing spec for computed prop strokeDashArray 2017-11-13 17:04:34 -06:00
Eric Eastwood 81862c2de1 Backport spec changes from EE remove approvals in empty state
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
2017-11-13 16:16:47 -06:00