BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9d958af5
Commit
9d958af5
authored
Mar 28, 2018
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Utility Function based on Review Comments
parent
a868ca0b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
11 deletions
+4
-11
mr_file_icon.vue
app/assets/javascripts/ide/components/mr_file_icon.vue
+1
-7
repo_file.vue
app/assets/javascripts/ide/components/repo_file.vue
+0
-1
url_utility.js
app/assets/javascripts/lib/utils/url_utility.js
+3
-3
No files found.
app/assets/javascripts/ide/components/mr_file_icon.vue
View file @
9d958af5
...
...
@@ -9,12 +9,6 @@ export default {
directives
:
{
tooltip
,
},
props
:
{
file
:
{
type
:
Object
,
required
:
true
,
},
},
};
</
script
>
...
...
@@ -22,7 +16,7 @@ export default {
<icon
name=
"git-merge"
v-tooltip
title=
"
Part of merge request changes
"
title=
"
__('Part of merge request changes')
"
css-classes=
"ide-file-changed-icon"
:size=
"12"
/>
...
...
app/assets/javascripts/ide/components/repo_file.vue
View file @
9d958af5
...
...
@@ -103,7 +103,6 @@ export default {
</span>
<span
class=
"pull-right"
>
<mr-file-icon
:file=
"file"
v-if=
"file.mrChange"
/>
<changed-file-icon
...
...
app/assets/javascripts/lib/utils/url_utility.js
View file @
9d958af5
...
...
@@ -84,10 +84,10 @@ export function redirectTo(url) {
return
window
.
location
.
assign
(
url
);
}
export
function
webIDEUrl
(
projectUrl
=
undefined
)
{
export
function
webIDEUrl
(
route
=
undefined
)
{
let
returnUrl
=
`
${
gon
.
relative_url_root
}
/-/ide/`
;
if
(
projectUrl
)
{
returnUrl
+=
`project
${
projectUrl
}
`
;
if
(
route
)
{
returnUrl
+=
`project
${
route
}
`
;
}
return
returnUrl
;
}
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