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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7ee7beee
Commit
7ee7beee
authored
Oct 02, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-02
parents
2dbed5d6
9087964c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
80 additions
and
6 deletions
+80
-6
.gitlab-ci.yml
.gitlab-ci.yml
+4
-5
Dangerfile
Dangerfile
+2
-0
app/assets/stylesheets/framework/contextual_sidebar.scss
app/assets/stylesheets/framework/contextual_sidebar.scss
+1
-1
changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml
...s/unreleased/align-collapsed-sidebar-avatar-container.yml
+5
-0
danger/eslint/Dangerfile
danger/eslint/Dangerfile
+29
-0
danger/prettier/Dangerfile
danger/prettier/Dangerfile
+39
-0
No files found.
.gitlab-ci.yml
View file @
7ee7beee
...
...
@@ -72,10 +72,7 @@ stages:
.use-pg
:
&use-pg
services
:
# As of Jan 2018, we don't have a strong reason to upgrade to 9.6 for CI yet,
# so using the least common denominator ensures backwards compatibility
# (as many users are still using 9.2).
-
postgres:9.2
-
postgres:9.6
-
redis:alpine
.use-mysql
:
&use-mysql
...
...
@@ -579,10 +576,10 @@ setup-test-env:
-
vendor/gitaly-ruby
danger-review
:
<<
:
*pull-cache
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:danger
stage
:
test
allow_failure
:
true
cache
:
{}
dependencies
:
[]
before_script
:
[]
only
:
...
...
@@ -596,6 +593,8 @@ danger-review:
-
$CI_COMMIT_REF_NAME =~ /.*-stable(-ee)?-prepare-.*/
script
:
-
git version
-
node --version
-
yarn install --frozen-lockfile --cache-folder .yarn-cache
-
danger --fail-on-errors=true
# EE jobs
...
...
Dangerfile
View file @
7ee7beee
...
...
@@ -7,3 +7,5 @@ danger.import_dangerfile(path: 'danger/database')
danger
.
import_dangerfile
(
path:
'danger/documentation'
)
danger
.
import_dangerfile
(
path:
'danger/frozen_string'
)
danger
.
import_dangerfile
(
path:
'danger/commit_messages'
)
danger
.
import_dangerfile
(
path:
'danger/prettier'
)
danger
.
import_dangerfile
(
path:
'danger/eslint'
)
app/assets/stylesheets/framework/contextual_sidebar.scss
View file @
7ee7beee
...
...
@@ -113,7 +113,7 @@
}
.avatar-container
{
margin
-right
:
0
;
margin
:
0
auto
;
}
}
...
...
changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml
0 → 100644
View file @
7ee7beee
---
title
:
Align collapsed sidebar avatar container
merge_request
:
22044
author
:
George Tsiolis
type
:
other
danger/eslint/Dangerfile
0 → 100644
View file @
7ee7beee
# frozen_string_literal: true
def
get_eslint_files
(
files
)
files
.
select
do
|
file
|
file
.
end_with?
(
'.js'
,
'.vue'
)
&&
File
.
read
(
file
).
include?
(
'/* eslint-disable'
)
end
end
eslint_candidates
=
get_eslint_files
(
git
.
added_files
+
git
.
modified_files
)
return
if
eslint_candidates
.
empty?
warn
'This merge request changed files with disabled eslint rules. Please consider fixing them.'
markdown
(
<<~
MARKDOWN
)
## Disabled eslint rules
The following files have disabled `eslint` rules. Please consider fixing them:
*
#{
eslint_candidates
.
map
{
|
path
|
"`
#{
path
}
`"
}
.join("
\n
* ")}
Run the following command for more details
```
node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config
\\
#{
eslint_candidates
.
map
{
|
path
|
" '
#{
path
}
'"
}
.join("
\\\n
")}
```
MARKDOWN
danger/prettier/Dangerfile
0 → 100644
View file @
7ee7beee
# frozen_string_literal: true
def
get_prettier_files
(
files
)
files
.
select
do
|
file
|
file
.
end_with?
(
'.js'
,
'.scss'
,
'.vue'
)
end
end
prettier_candidates
=
get_prettier_files
(
git
.
added_files
+
git
.
modified_files
)
return
if
prettier_candidates
.
empty?
unpretty
=
`node_modules/prettier/bin-prettier.js --list-different
#{
prettier_candidates
.
join
(
" "
)
}
`
.
split
(
/$/
)
.
map
(
&
:strip
)
.
reject
(
&
:empty?
)
return
if
unpretty
.
empty?
warn
'This merge request changed frontend files without pretty printing them.'
markdown
(
<<~
MARKDOWN
)
## Pretty print Frontend files
The following files should have been pretty printed with `prettier`:
*
#{
unpretty
.
map
{
|
path
|
"`
#{
path
}
`"
}
.join("
\n
* ")}
Please run
```
node_modules/.bin/prettier --write
\\
#{
unpretty
.
map
{
|
path
|
" '
#{
path
}
'"
}
.join("
\\\n
")}
```
Also consider auto-formatting [on-save].
[on-save]: https://docs.gitlab.com/ee/development/new_fe_guide/style/prettier.html
MARKDOWN
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