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
4972999c
Commit
4972999c
authored
Mar 26, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
d162e59c
eb778018
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
3 deletions
+25
-3
app/assets/javascripts/jobs/components/commit_block.vue
app/assets/javascripts/jobs/components/commit_block.vue
+1
-1
changelogs/unreleased/MaxWinterstein-master-patch-23232.yml
changelogs/unreleased/MaxWinterstein-master-patch-23232.yml
+5
-0
lib/gitlab/danger/helper.rb
lib/gitlab/danger/helper.rb
+17
-1
spec/javascripts/jobs/components/commit_block_spec.js
spec/javascripts/jobs/components/commit_block_spec.js
+2
-1
No files found.
app/assets/javascripts/jobs/components/commit_block.vue
View file @
4972999c
...
...
@@ -39,7 +39,7 @@ export default {
</gl-link>
<clipboard-button
:text=
"commit.
short_
id"
:text=
"commit.id"
:title=
"__('Copy commit SHA to clipboard')"
css-class=
"btn btn-clipboard btn-transparent"
/>
...
...
changelogs/unreleased/MaxWinterstein-master-patch-23232.yml
0 → 100644
View file @
4972999c
---
title
:
Unify behaviour of 'Copy commit SHA to clipboard' to use full commit SHA.
merge_request
:
25829
author
:
Max Winterstein
type
:
changed
lib/gitlab/danger/helper.rb
View file @
4972999c
...
...
@@ -108,7 +108,23 @@ module Gitlab
%r{
\A
(ee/)?public/}
=>
:frontend
,
%r{
\A
(ee/)?spec/(javascripts|frontend)/}
=>
:frontend
,
%r{
\A
(ee/)?vendor/assets/}
=>
:frontend
,
%r{
\A
(jest
\.
config
\.
js|package
\.
json|yarn
\.
lock|
\.
eslintrc
\.
yml)
\z
}
=>
:frontend
,
%r{
\A
scripts/frontend/}
=>
:frontend
,
%r{(
\A
|/)(
\.
babelrc |
\.
eslintignore |
\.
eslintrc(
\.
yml)? |
\.
nvmrc |
\.
prettierignore |
\.
prettierrc |
\.
scss-lint.yml |
\.
stylelintrc |
babel
\.
config
\.
js |
jest
\.
config
\.
js |
karma
\.
config
\.
js |
webpack
\.
config
\.
js |
package
\.
json |
yarn
\.
lock
)
\z
}x
=>
:frontend
,
%r{
\A
(ee/)?app/(?!assets|views)[^/]+}
=>
:backend
,
%r{
\A
(ee/)?(bin|config|danger|generator_templates|lib|rubocop|scripts)/}
=>
:backend
,
...
...
spec/javascripts/jobs/components/commit_block_spec.js
View file @
4972999c
...
...
@@ -9,6 +9,7 @@ describe('Commit block', () => {
const
props
=
{
commit
:
{
short_id
:
'
1f0fb84f
'
,
id
:
'
1f0fb84fb6770d74d97eee58118fd3909cd4f48c
'
,
commit_path
:
'
commit/1f0fb84fb6770d74d97eee58118fd3909cd4f48c
'
,
title
:
'
Update README.md
'
,
},
...
...
@@ -42,7 +43,7 @@ describe('Commit block', () => {
it
(
'
renders clipboard button
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
button
'
).
getAttribute
(
'
data-clipboard-text
'
)).
toEqual
(
props
.
commit
.
short_
id
,
props
.
commit
.
id
,
);
});
});
...
...
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