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
20f2987a
Commit
20f2987a
authored
Aug 02, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Fix broken links for signin and register path
parent
85f2d7d4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
13 deletions
+26
-13
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+2
-1
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+8
-3
app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue
...scripts/notes/components/issue_note_signed_out_widget.vue
+13
-7
app/assets/javascripts/notes/components/issue_notes_app.vue
app/assets/javascripts/notes/components/issue_notes_app.vue
+2
-1
app/assets/javascripts/notes/stores/getters.js
app/assets/javascripts/notes/stores/getters.js
+1
-1
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
20f2987a
...
...
@@ -33,9 +33,10 @@
computed
:
{
...
mapGetters
([
'
getCurrentUserLastNote
'
,
'
getUserData
'
,
]),
isLoggedIn
()
{
return
window
.
gon
.
current_user_id
;
return
this
.
getUserData
===
null
?
false
:
true
;
},
commentButtonTitle
()
{
return
this
.
noteType
===
constants
.
COMMENT
?
'
Comment
'
:
'
Start discussion
'
;
...
...
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
20f2987a
<
script
>
/* global Flash */
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
issueNote
from
'
./issue_note.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
...
...
@@ -21,7 +21,6 @@
},
data
()
{
return
{
newNotePath
:
window
.
gl
.
issueData
.
create_note_path
,
isReplying
:
false
,
};
},
...
...
@@ -37,6 +36,9 @@
placeholderSystemNote
,
},
computed
:
{
...
mapGetters
([
'
getIssueData
'
,
]),
discussion
()
{
return
this
.
note
.
notes
[
0
];
},
...
...
@@ -44,8 +46,11 @@
return
this
.
discussion
.
author
;
},
canReply
()
{
return
window
.
gl
.
i
ssueData
.
current_user
.
can_create_note
;
return
this
.
getI
ssueData
.
current_user
.
can_create_note
;
},
newNotePath
()
{
return
this
.
getIssueData
.
create_note_path
;
}
},
methods
:
{
...
mapActions
([
...
...
app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue
View file @
20f2987a
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
export
default
{
name
:
'
singInLinksNotes
'
,
data
()
{
const
{
newSessionPath
,
registerPath
}
=
this
.
$store
.
getters
.
notesData
;
computed
:
{
...
mapGetters
([
'
getNotesDataByProp
'
]),
registerLink
()
{
return
this
.
getNotesDataByProp
(
'
registerPath
'
)
return
{
signInLink
:
newSessionPath
,
re
gisterLink
:
registerPath
,
}
;
}
,
},
signInLink
(){
re
turn
this
.
getNotesDataByProp
(
'
newSessionPath
'
);
}
}
};
</
script
>
...
...
app/assets/javascripts/notes/components/issue_notes_app.vue
View file @
20f2987a
...
...
@@ -26,7 +26,8 @@
},
userData
:
{
type
:
Object
,
required
:
true
,
required
:
false
,
default
:
{}
},
},
store
,
...
...
app/assets/javascripts/notes/stores/getters.js
View file @
20f2987a
...
...
@@ -8,7 +8,7 @@ export const getIssueData = state => state.issueData;
export
const
getIssueDataByProp
=
state
=>
prop
=>
state
.
issueData
[
prop
];
export
const
getUserData
=
state
=>
state
.
userData
;
export
const
getUserDataByProp
=
state
=>
prop
=>
state
.
userData
[
prop
];
export
const
getUserDataByProp
=
state
=>
prop
=>
state
.
userData
&&
state
.
userData
[
prop
];
export
const
notesById
=
state
=>
state
.
notes
.
reduce
((
acc
,
note
)
=>
{
note
.
notes
.
every
(
n
=>
Object
.
assign
(
acc
,
{
[
n
.
id
]:
n
}));
...
...
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