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
f4a7765f
Commit
f4a7765f
authored
Apr 03, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
946dc59b
dfe2fabf
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
2 deletions
+73
-2
Dangerfile
Dangerfile
+1
-0
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+1
-1
app/assets/stylesheets/page_bundles/ide.scss
app/assets/stylesheets/page_bundles/ide.scss
+8
-0
changelogs/unreleased/47771-highlighting-in-diff.yml
changelogs/unreleased/47771-highlighting-in-diff.yml
+5
-0
danger/gitlab_ui_wg/Dangerfile
danger/gitlab_ui_wg/Dangerfile
+55
-0
danger/roulette/Dangerfile
danger/roulette/Dangerfile
+3
-1
No files found.
Dangerfile
View file @
f4a7765f
...
...
@@ -13,3 +13,4 @@ danger.import_dangerfile(path: 'danger/prettier')
danger
.
import_dangerfile
(
path:
'danger/eslint'
)
danger
.
import_dangerfile
(
path:
'danger/roulette'
)
danger
.
import_dangerfile
(
path:
'danger/single_codebase'
)
danger
.
import_dangerfile
(
path:
'danger/gitlab_ui_wg'
)
app/assets/javascripts/notes/components/noteable_note.vue
View file @
f4a7765f
...
...
@@ -96,7 +96,7 @@ export default {
return
''
;
}
// We need to do this to ensure we have the c
u
rrect sentence order
// We need to do this to ensure we have the c
o
rrect sentence order
// when translating this as the sentence order may change from one
// language to the next. See:
// https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24427#note_133713771
...
...
app/assets/stylesheets/page_bundles/ide.scss
View file @
f4a7765f
...
...
@@ -179,6 +179,14 @@ $ide-commit-header-height: 48px;
display
:
none
;
}
.monaco-editor
.selected-text
{
z-index
:
1
;
}
.monaco-editor
.view-lines
{
z-index
:
2
;
}
.is-readonly
,
.editor.original
{
.view-lines
{
...
...
changelogs/unreleased/47771-highlighting-in-diff.yml
0 → 100644
View file @
f4a7765f
---
title
:
Enabled text selection highlighting in diffs in Web IDE
merge_request
:
26721
author
:
Isaac Smith
type
:
fixed
danger/gitlab_ui_wg/Dangerfile
0 → 100644
View file @
f4a7765f
def
mention_single_codebase_approvers
frontend_maintainers
=
%w(@filipa @iamphill @psimyn @sarahghp @mishunov)
ux_maintainers
=
%w(@tauriedavis @rverissimo)
rows
=
[]
users
=
[]
if
gitlab
.
mr_labels
.
include?
(
'frontend'
)
frontend_maintainer
=
frontend_maintainers
.
sample
rows
<<
"| ~frontend | `
#{
frontend_maintainer
}
`"
users
<<
frontend_maintainer
end
if
gitlab
.
mr_labels
.
include?
(
'UX'
)
ux_maintainers
=
ux_maintainers
.
sample
rows
<<
"| ~UX | `
#{
ux_maintainers
}
`"
users
<<
ux_maintainers
end
if
rows
.
empty?
backup_maintainer
=
frontend_maintainers
.
sample
rows
<<
"| ~frontend / ~UX | `
#{
backup_maintainer
}
`"
users
<<
backup_maintainer
end
markdown
(
<<~
MARKDOWN
.
strip
)
## GitLab UI Working Group changes
This merge request contains changes related to the work of [cleaning up CSS and creating
reusable components](https://gitlab.com/groups/gitlab-org/-/epics/950).
These changes will need to be reviewed and approved by the following engineers:
| Category | Reviewer
|----------|---------
#{
rows
.
join
(
"
\n
"
)
}
To make sure this happens, please follow these steps:
1. Add all of the mentioned users to the list of merge request approvals.
2. Assign the merge request to the first person in the above list.
If you are a reviewer, please follow these steps:
1. Review the merge request. If it is good to go, approve it.
2. Once approved, assign to the next person in the above list. If you are
the last person in the list, merge the merge request.
MARKDOWN
end
if
gitlab
.
mr_labels
.
include?
(
'CSS cleanup'
)
mention_single_codebase_approvers
end
danger/roulette/Dangerfile
View file @
f4a7765f
...
...
@@ -60,7 +60,9 @@ categories = changes.keys - [:unknown]
# Single codebase MRs are reviewed using a slightly different process, so we
# disable the review roulette for such MRs.
if
changes
.
any?
&&
!
gitlab
.
mr_labels
.
include?
(
'single codebase'
)
# CSS Clean up MRs are reviewed using a slightly different process, so we
# disable the review roulette for such MRs.
if
changes
.
any?
&&
!
gitlab
.
mr_labels
.
include?
(
'single codebase'
)
&&
!
gitlab
.
mr_labels
.
include?
(
'CSS cleanup'
)
team
=
begin
helper
.
project_team
...
...
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