Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
da521875
Commit
da521875
authored
6 years ago
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into dispatcher-mr-haml
parents
c7c211c2
8462e229
No related merge requests found
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
98 additions
and
59 deletions
+98
-59
CHANGELOG.md
CHANGELOG.md
+19
-0
app/assets/javascripts/ide/monaco_loader.js
app/assets/javascripts/ide/monaco_loader.js
+5
-0
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
..._widget/components/states/mr_widget_auto_merge_failed.vue
+4
-1
changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
...merge-request-undefined-method-index-for-nil-nilclass.yml
+0
-5
changelogs/unreleased/42591-update-nokogiri.yml
changelogs/unreleased/42591-update-nokogiri.yml
+0
-5
changelogs/unreleased/42641-monaco-service-workers-do-not-work-with-cdn-enabled.yml
...1-monaco-service-workers-do-not-work-with-cdn-enabled.yml
+5
-0
changelogs/unreleased/42696-gitlab-import-leaves-group_id-on-projectlabel.yml
...d/42696-gitlab-import-leaves-group_id-on-projectlabel.yml
+0
-5
changelogs/unreleased/bvl-fix-500-on-fork-without-restricted-visibility-levels.yml
...-fix-500-on-fork-without-restricted-visibility-levels.yml
+0
-5
changelogs/unreleased/dm-user-namespace-route-path-validation.yml
...gs/unreleased/dm-user-namespace-route-path-validation.yml
+0
-5
changelogs/unreleased/fj-37528-error-after-disabling-ldap.yml
...gelogs/unreleased/fj-37528-error-after-disabling-ldap.yml
+0
-6
changelogs/unreleased/fl-refresh-btn.yml
changelogs/unreleased/fl-refresh-btn.yml
+5
-0
changelogs/unreleased/mk-fix-no-untracked-upload-files-error.yml
...ogs/unreleased/mk-fix-no-untracked-upload-files-error.yml
+0
-5
changelogs/unreleased/sh-fix-jira-trailing-slash.yml
changelogs/unreleased/sh-fix-jira-trailing-slash.yml
+0
-5
changelogs/unreleased/winh-new-branch-dropdown-style.yml
changelogs/unreleased/winh-new-branch-dropdown-style.yml
+0
-5
lib/api/project_import.rb
lib/api/project_import.rb
+6
-2
lib/tasks/lint.rake
lib/tasks/lint.rake
+49
-0
scripts/static-analysis
scripts/static-analysis
+3
-8
spec/requests/api/project_import_spec.rb
spec/requests/api/project_import_spec.rb
+2
-2
No files found.
CHANGELOG.md
View file @
da521875
...
...
@@ -2,6 +2,25 @@
documentation
](
doc/development/changelog.md
)
for instructions on adding your own
entry.
## 10.4.4 (2018-02-16)
### Security (1 change)
-
Update nokogiri to 1.8.2. !16807
### Fixed (9 changes)
-
Fix 500 error when loading a merge request with an invalid comment. !16795
-
Cleanup new branch/merge request form in issues. !16854
-
Fix GitLab import leaving group_id on ProjectLabel. !16877
-
Fix forking projects when no restricted visibility levels are defined applicationwide. !16881
-
Resolve PrepareUntrackedUploads PostgreSQL syntax error. !17019
-
Fixed error 500 when removing an identity with synced attributes and visiting the profile page. !17054
-
Validate user namespace before saving so that errors persist on model.
-
LDAP Person no longer throws exception on invalid entry.
-
Fix JIRA not working when a trailing slash is included.
## 10.4.3 (2018-02-05)
### Security (4 changes)
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/ide/monaco_loader.js
View file @
da521875
...
...
@@ -6,6 +6,11 @@ monacoContext.require.config({
},
});
// ignore CDN config and use local assets path for service worker which cannot be cross-domain
const
relativeRootPath
=
(
gon
&&
gon
.
relative_url_root
)
||
''
;
const
monacoPath
=
`
${
relativeRootPath
}
/assets/webpack/monaco-editor/vs`
;
window
.
MonacoEnvironment
=
{
getWorkerUrl
:
()
=>
`
${
monacoPath
}
/base/worker/workerMain.js`
};
// eslint-disable-next-line no-underscore-dangle
window
.
__monaco_context__
=
monacoContext
;
export
default
monacoContext
.
require
;
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
View file @
da521875
...
...
@@ -44,7 +44,10 @@
type=
"button"
class=
"btn btn-xs btn-default"
>
<loading-icon
v-if=
"isRefreshing"
/>
<loading-icon
v-if=
"isRefreshing"
:inline=
"true"
/>
{{ s__("mrWidget|Refresh") }}
</button>
</div>
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Fix 500 error when loading a merge request with an invalid comment
merge_request
:
16795
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/42591-update-nokogiri.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Update nokogiri to 1.8.2
merge_request
:
16807
author
:
type
:
security
This diff is collapsed.
Click to expand it.
changelogs/unreleased/42641-monaco-service-workers-do-not-work-with-cdn-enabled.yml
0 → 100644
View file @
da521875
---
title
:
Fix monaco editor features which were incompatable with GitLab CDN settings
merge_request
:
17021
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/42696-gitlab-import-leaves-group_id-on-projectlabel.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Fix GitLab import leaving group_id on ProjectLabel
merge_request
:
16877
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/bvl-fix-500-on-fork-without-restricted-visibility-levels.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Fix forking projects when no restricted visibility levels are defined applicationwide
merge_request
:
16881
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/dm-user-namespace-route-path-validation.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Validate user namespace before saving so that errors persist on model
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/fj-37528-error-after-disabling-ldap.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Fixed error 500 when removing an identity with synced attributes and visiting
the profile page
merge_request
:
17054
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/
remove_ldap_person_validatio
n.yml
→
changelogs/unreleased/
fl-refresh-bt
n.yml
View file @
da521875
---
title
:
LDAP Person no longer throws exception on invalid entry
title
:
Show loading button inline in refresh button in MR widget
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/mk-fix-no-untracked-upload-files-error.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Resolve PrepareUntrackedUploads PostgreSQL syntax error
merge_request
:
17019
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/sh-fix-jira-trailing-slash.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Fix JIRA not working when a trailing slash is included
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
changelogs/unreleased/winh-new-branch-dropdown-style.yml
deleted
100644 → 0
View file @
c7c211c2
---
title
:
Cleanup new branch/merge request form in issues
merge_request
:
16854
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
lib/api/project_import.rb
View file @
da521875
...
...
@@ -41,8 +41,12 @@ module API
current_user
.
namespace
end
project_params
=
import_params
.
merge
(
namespace_id:
namespace
.
id
,
file:
import_params
[
:file
][
'tempfile'
])
project_params
=
{
path:
import_params
[
:path
],
namespace_id:
namespace
.
id
,
file:
import_params
[
:file
][
'tempfile'
]
}
project
=
::
Projects
::
GitlabProjectsImportService
.
new
(
current_user
,
project_params
).
execute
render_api_error!
(
project
.
errors
.
full_messages
&
.
first
,
400
)
unless
project
.
saved?
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/lint.rake
View file @
da521875
...
...
@@ -16,5 +16,54 @@ unless Rails.env.production?
task
:javascript
do
Rake
::
Task
[
'eslint'
].
invoke
end
desc
"GitLab | lint | Run several lint checks"
task
:all
do
status
=
0
%w[
config_lint
haml_lint
scss_lint
flay
gettext:lint
lint:static_verification
]
.
each
do
|
task
|
pid
=
Process
.
fork
do
rd
,
wr
=
IO
.
pipe
stdout
=
$stdout
.
dup
stderr
=
$stderr
.
dup
$stdout
.
reopen
(
wr
)
$stderr
.
reopen
(
wr
)
begin
begin
Rake
::
Task
[
task
].
invoke
rescue
RuntimeError
# The haml_lint tasks raise a RuntimeError
exit
(
1
)
end
rescue
SystemExit
=>
ex
msg
=
"*** Rake task
#{
task
}
failed with the following error(s):"
raise
ex
ensure
$stdout
.
reopen
(
stdout
)
$stderr
.
reopen
(
stderr
)
wr
.
close
if
msg
warn
"
\n
#{
msg
}
\n\n
"
IO
.
copy_stream
(
rd
,
$stderr
)
else
IO
.
copy_stream
(
rd
,
$stdout
)
end
end
end
Process
.
waitpid
(
pid
)
status
+=
$?
.
exitstatus
end
exit
(
status
)
end
end
end
This diff is collapsed.
Click to expand it.
scripts/static-analysis
View file @
da521875
...
...
@@ -7,7 +7,7 @@ require_relative '../lib/gitlab/popen/runner'
def
emit_warnings
(
static_analysis
)
static_analysis
.
warned_results
.
each
do
|
result
|
puts
puts
"****
#{
result
.
cmd
.
join
(
' '
)
}
had the following warning
s
:"
puts
"****
#{
result
.
cmd
.
join
(
' '
)
}
had the following warning
(s)
:"
puts
puts
result
.
stderr
puts
...
...
@@ -17,7 +17,7 @@ end
def
emit_errors
(
static_analysis
)
static_analysis
.
failed_results
.
each
do
|
result
|
puts
puts
"****
#{
result
.
cmd
.
join
(
' '
)
}
failed with the following error:"
puts
"****
#{
result
.
cmd
.
join
(
' '
)
}
failed with the following error
(s)
:"
puts
puts
result
.
stdout
puts
result
.
stderr
...
...
@@ -26,15 +26,10 @@ def emit_errors(static_analysis)
end
tasks
=
[
%w[bundle exec rake config_lint]
,
%w[bundle exec rake flay]
,
%w[bundle exec rake haml_lint]
,
%w[bundle exec rake scss_lint]
,
%w[bin/rake lint:all]
,
%w[bundle exec license_finder]
,
%w[yarn run eslint]
,
%w[bundle exec rubocop --parallel]
,
%w[bundle exec rake gettext:lint]
,
%w[bundle exec rake lint:static_verification]
,
%w[scripts/lint-conflicts.sh]
,
%w[scripts/lint-rugged]
]
...
...
This diff is collapsed.
Click to expand it.
spec/requests/api/project_import_spec.rb
View file @
da521875
...
...
@@ -42,7 +42,7 @@ describe API::ProjectImport do
it
'schedules an import at the user namespace level'
do
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_schedule
)
expect
(
Gitlab
::
ImportExport
::
ProjectCreator
).
not_to
receive
(
:new
)
expect
(
::
Projects
::
CreateService
).
not_to
receive
(
:new
)
post
api
(
'/projects/import'
,
user
),
namespace:
'nonexistent'
,
path:
'test-import2'
,
file:
fixture_file_upload
(
file
)
...
...
@@ -73,7 +73,7 @@ describe API::ProjectImport do
def
stub_import
(
namespace
)
expect_any_instance_of
(
Project
).
to
receive
(
:import_schedule
)
expect
(
Gitlab
::
ImportExport
::
ProjectCreator
).
to
receive
(
:new
).
with
(
namespace
.
id
,
any_args
).
and_call_original
expect
(
::
Projects
::
CreateService
).
to
receive
(
:new
).
with
(
user
,
hash_including
(
namespace_id:
namespace
.
id
)
).
and_call_original
end
end
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment