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
a1f2bd7d
Commit
a1f2bd7d
authored
Aug 02, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Remove lock from ce
parent
0786b87e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
app/assets/javascripts/repo/repo_file_buttons.vue
app/assets/javascripts/repo/repo_file_buttons.vue
+0
-1
spec/javascripts/repo/repo_commit_section_spec.js
spec/javascripts/repo/repo_commit_section_spec.js
+1
-1
spec/javascripts/repo/repo_file_buttons_spec.js
spec/javascripts/repo/repo_file_buttons_spec.js
+1
-2
spec/javascripts/repo/repo_file_options_spec.js
spec/javascripts/repo/repo_file_options_spec.js
+1
-1
No files found.
app/assets/javascripts/repo/repo_file_buttons.vue
View file @
a1f2bd7d
...
@@ -51,7 +51,6 @@ export default RepoFileButtons;
...
@@ -51,7 +51,6 @@ export default RepoFileButtons;
<a
:href=
"blameFileURL"
class=
"btn btn-default blame"
>
Blame
</a>
<a
:href=
"blameFileURL"
class=
"btn btn-default blame"
>
Blame
</a>
<a
:href=
"historyFileURL"
class=
"btn btn-default history"
>
History
</a>
<a
:href=
"historyFileURL"
class=
"btn btn-default history"
>
History
</a>
<a
href=
"#"
class=
"btn btn-default permalink"
>
Permalink
</a>
<a
href=
"#"
class=
"btn btn-default permalink"
>
Permalink
</a>
<a
href=
"#"
class=
"btn btn-default lock"
>
Lock
</a>
</div>
</div>
<a
href=
"#"
v-if=
"canPreview"
@
click.prevent=
"rawPreviewToggle"
class=
"btn btn-default preview"
>
{{
activeFileLabel
}}
</a>
<a
href=
"#"
v-if=
"canPreview"
@
click.prevent=
"rawPreviewToggle"
class=
"btn btn-default preview"
>
{{
activeFileLabel
}}
</a>
...
...
spec/javascripts/repo/repo_commit_section_spec.js
View file @
a1f2bd7d
...
@@ -4,7 +4,7 @@ import RepoStore from '~/repo/repo_store';
...
@@ -4,7 +4,7 @@ import RepoStore from '~/repo/repo_store';
import
RepoHelper
from
'
~/repo/repo_helper
'
;
import
RepoHelper
from
'
~/repo/repo_helper
'
;
import
Api
from
'
~/api
'
;
import
Api
from
'
~/api
'
;
f
describe
(
'
RepoCommitSection
'
,
()
=>
{
describe
(
'
RepoCommitSection
'
,
()
=>
{
const
branch
=
'
master
'
;
const
branch
=
'
master
'
;
const
openedFiles
=
[{
const
openedFiles
=
[{
id
:
0
,
id
:
0
,
...
...
spec/javascripts/repo/repo_file_buttons_spec.js
View file @
a1f2bd7d
...
@@ -9,7 +9,7 @@ describe('RepoFileButtons', () => {
...
@@ -9,7 +9,7 @@ describe('RepoFileButtons', () => {
return
new
RepoFileButtons
().
$mount
();
return
new
RepoFileButtons
().
$mount
();
}
}
it
(
'
renders Raw, Blame, History, Permalink
, Lock
and Preview toggle
'
,
()
=>
{
it
(
'
renders Raw, Blame, History, Permalink and Preview toggle
'
,
()
=>
{
const
activeFile
=
{
const
activeFile
=
{
extension
:
'
md
'
,
extension
:
'
md
'
,
url
:
'
url
'
,
url
:
'
url
'
,
...
@@ -34,7 +34,6 @@ describe('RepoFileButtons', () => {
...
@@ -34,7 +34,6 @@ describe('RepoFileButtons', () => {
expect
(
history
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
history
.
href
).
toMatch
(
`/
${
activeFile
.
url
}
`
);
expect
(
history
.
textContent
).
toEqual
(
'
History
'
);
expect
(
history
.
textContent
).
toEqual
(
'
History
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.permalink
'
).
textContent
).
toEqual
(
'
Permalink
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.permalink
'
).
textContent
).
toEqual
(
'
Permalink
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.lock
'
).
textContent
).
toEqual
(
'
Lock
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.preview
'
).
textContent
).
toEqual
(
activeFileLabel
);
expect
(
vm
.
$el
.
querySelector
(
'
.preview
'
).
textContent
).
toEqual
(
activeFileLabel
);
});
});
...
...
spec/javascripts/repo/repo_file_options_spec.js
View file @
a1f2bd7d
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
repoFileOptions
from
'
~/repo/repo_file_options.vue
'
;
import
repoFileOptions
from
'
~/repo/repo_file_options.vue
'
;
describe
(
'
RepoFileOptions
'
,
()
=>
{
f
describe
(
'
RepoFileOptions
'
,
()
=>
{
const
projectName
=
'
projectName
'
;
const
projectName
=
'
projectName
'
;
function
createComponent
(
propsData
)
{
function
createComponent
(
propsData
)
{
...
...
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