Skip to content

G
gitlab-ce
Commit 68d3119c authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-30 

# Conflicts:
#	locale/gitlab.pot

[ci skip]
parents b99a1fa4 9c491bc6
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 30 deletions
Gemfile
View file @ 68d3119c
......@@ -380,7 +380,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'license_finder', '~> 3.1', require: false
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.16'
gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
......
Gemfile.lock
View file @ 68d3119c
......@@ -94,7 +94,6 @@ GEM
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
bootsnap (1.3.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
......@@ -493,13 +492,12 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
license_finder (3.1.1)
license_finder (5.4.0)
bundler
httparty
rubyzip
thor
toml (= 0.1.2)
with_env (> 1.0)
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
......@@ -618,8 +616,7 @@ GEM
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
parslet (1.5.0)
blankslate (~> 2.0)
parslet (1.8.2)
path_expander (1.0.2)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
......@@ -939,8 +936,8 @@ GEM
tilt (2.0.8)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.1.2)
parslet (~> 1.5.0)
toml (0.2.0)
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
trollop (2.1.3)
......@@ -1120,7 +1117,7 @@ DEPENDENCIES
knapsack (~> 1.16)
kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 3.1)
license_finder (~> 5.4)
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
......@@ -1242,4 +1239,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.16.3
1.16.4
Gemfile.rails5.lock
View file @ 68d3119c
......@@ -97,7 +97,6 @@ GEM
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
bootsnap (1.3.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
......@@ -496,13 +495,12 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
license_finder (3.1.1)
license_finder (5.4.0)
bundler
httparty
rubyzip
thor
toml (= 0.1.2)
with_env (> 1.0)
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
......@@ -622,8 +620,7 @@ GEM
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
parslet (1.5.0)
blankslate (~> 2.0)
parslet (1.8.2)
path_expander (1.0.2)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
......@@ -946,8 +943,8 @@ GEM
tilt (2.0.8)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.1.2)
parslet (~> 1.5.0)
toml (0.2.0)
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
trollop (2.1.3)
......@@ -1130,7 +1127,7 @@ DEPENDENCIES
knapsack (~> 1.16)
kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 3.1)
license_finder (~> 5.4)
licensee (~> 8.9)
lograge (~> 0.5)
loofah (~> 2.2)
......@@ -1252,4 +1249,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.16.3
1.16.4
app/assets/javascripts/ide/components/new_dropdown/upload.vue
View file @ 68d3119c
......@@ -24,12 +24,6 @@ export default {
default: null,
},
},
mounted() {
this.$refs.fileUpload.addEventListener('change', this.openFile);
},
beforeDestroy() {
this.$refs.fileUpload.removeEventListener('change', this.openFile);
},
methods: {
createFile(target, file, isText) {
const { name } = file;
......@@ -85,6 +79,8 @@ export default {
ref="fileUpload"
type="file"
class="hidden"
multiple
@change="openFile"
/>
</div>
</template>
app/views/projects/milestones/_deprecation_message.html.haml 0 → 100644
View file @ 68d3119c
.banner-callout.compact.milestone-deprecation-message.prepend-top-20
.banner-graphic= image_tag 'illustrations/milestone_removing-page.svg'
.banner-body.prepend-left-10.append-right-10
%h5.banner-title.prepend-top-0
= _('The tabs below will be removed in a future version')
%p.milestone-banner-text
= _('Learn more about %{issue_boards_url}, to keep track of issues in multiple lists, using labels, assignees, and milestones. If you’re missing something from issue boards, please create an issue on %{gitlab_issues_url}.').html_safe % { issue_boards_url: link_to(_('issue boards'), help_page_url('user/project/issue_board'), target: '_blank', rel: 'noopener noreferrer'), gitlab_issues_url: link_to(_('GitLab’s issue tracker'), 'https://gitlab.com/gitlab-org/gitlab-ce/issues', target: '_blank', rel: 'noopener noreferrer') }
app/views/projects/milestones/show.html.haml
View file @ 68d3119c
......@@ -67,5 +67,6 @@
.alert.alert-success.prepend-top-default
%span All issues for this milestone are closed. You may close this milestone now.
= render 'deprecation_message'
= render 'shared/milestones/tabs', milestone: @milestone
= render 'shared/milestones/sidebar', milestone: @milestone, project: @project, affix_offset: 153
changelogs/unreleased/47943-project-milestone-page-deprecation-message.yml 0 → 100644
View file @ 68d3119c
---
title: Show deprecation message on project milestone page for category tabs
merge_request: 21236
author:
type: changed
changelogs/unreleased/ide-multiple-file-uploads.yml 0 → 100644
View file @ 68d3119c
---
title: Enabled multiple file uploads in the Web IDE
merge_request:
author:
type: added
changelogs/unreleased/schema-changed-ee-backport.yml 0 → 100644
View file @ 68d3119c
---
title: Backport schema_changed.sh from EE which prints the diff if the schema is different
merge_request: 21422
author: Jasper Maes
type: other
doc/user/project/integrations/microsoft_teams.md
View file @ 68d3119c
......@@ -2,7 +2,7 @@
## On Microsoft Teams
To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/connectors#setting-up-a-custom-incoming-webhook).
To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/connectors/connectors-using#setting-up-a-custom-incoming-webhook).
## On GitLab
......
locale/gitlab.pot
View file @ 68d3119c
......@@ -3592,6 +3592,9 @@ msgstr ""
msgid "GitLab.com import"
msgstr ""
msgid "GitLab’s issue tracker"
msgstr ""
msgid "Gitaly"
msgstr ""
......@@ -4276,6 +4279,9 @@ msgstr ""
msgid "Learn more"
msgstr ""
msgid "Learn more about %{issue_boards_url}, to keep track of issues in multiple lists, using labels, assignees, and milestones. If you’re missing something from issue boards, please create an issue on %{gitlab_issues_url}."
msgstr ""
msgid "Learn more about Kubernetes"
msgstr ""
......@@ -7061,6 +7067,9 @@ msgstr ""
msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time."
msgstr ""
msgid "The tabs below will be removed in a future version"
msgstr ""
msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
msgstr ""
......@@ -8491,6 +8500,7 @@ msgstr ""
msgid "importing"
msgstr ""
<<<<<<< HEAD
msgid "instance completed"
msgid_plural "instances completed"
msgstr[0] ""
......@@ -8503,6 +8513,9 @@ msgid "is invalid because there is upstream lock"
msgstr ""
msgid "is not a valid X509 certificate."
=======
msgid "issue boards"
>>>>>>> upstream/master
msgstr ""
msgid "latest version"
......
spec/javascripts/ide/components/new_dropdown/upload_spec.js
View file @ 68d3119c
......@@ -21,6 +21,23 @@ describe('new dropdown upload', () => {
vm.$destroy();
});
describe('openFile', () => {
it('calls for each file', () => {
const files = ['test', 'test2', 'test3'];
spyOn(vm, 'readFile');
spyOnProperty(vm.$refs.fileUpload, 'files').and.returnValue(files);
vm.openFile();
expect(vm.readFile.calls.count()).toBe(3);
files.forEach((file, i) => {
expect(vm.readFile.calls.argsFor(i)).toEqual([file]);
});
});
});
describe('readFile', () => {
beforeEach(() => {
spyOn(FileReader.prototype, 'readAsText');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7