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
80da247a
Commit
80da247a
authored
Feb 01, 2019
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix lock version for epics
parent
e0c47610
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
1 deletion
+6
-1
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+2
-1
ee/app/assets/javascripts/epic/components/epic_body.vue
ee/app/assets/javascripts/epic/components/epic_body.vue
+2
-0
ee/app/assets/javascripts/epic/store/state.js
ee/app/assets/javascripts/epic/store/state.js
+1
-0
ee/app/helpers/epics_helper.rb
ee/app/helpers/epics_helper.rb
+1
-0
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
80da247a
...
...
@@ -133,7 +133,8 @@ export default {
},
lockVersion
:
{
type
:
Number
,
required
:
true
,
required
:
false
,
default
:
0
,
},
},
data
()
{
...
...
ee/app/assets/javascripts/epic/components/epic_body.vue
View file @
80da247a
...
...
@@ -30,6 +30,7 @@ export default {
'
initialTitleText
'
,
'
initialDescriptionHtml
'
,
'
initialDescriptionText
'
,
'
lockVersion
'
,
]),
},
};
...
...
@@ -49,6 +50,7 @@ export default {
:show-delete-button=
"canDestroy"
:initial-title-html=
"initialTitleHtml"
:initial-title-text=
"initialTitleText"
:lock-version=
"lockVersion"
:initial-description-html=
"initialDescriptionHtml"
:initial-description-text=
"initialDescriptionText"
:show-inline-edit-button=
"true"
...
...
ee/app/assets/javascripts/epic/store/state.js
View file @
80da247a
...
...
@@ -33,6 +33,7 @@ export default () => ({
initialTitleText
:
''
,
initialDescriptionHtml
:
''
,
initialDescriptionText
:
''
,
lockVersion
:
0
,
todoExists
:
false
,
startDateSourcingMilestoneTitle
:
''
,
...
...
ee/app/helpers/epics_helper.rb
View file @
80da247a
...
...
@@ -30,6 +30,7 @@ module EpicsHelper
start_date:
epic
.
due_date_sourcing_milestone
&
.
start_date
,
due_date:
epic
.
due_date_sourcing_milestone
&
.
due_date
},
lock_version:
epic
.
lock_version
,
end_date:
epic
.
end_date
,
state:
epic
.
state
,
namespace:
group
.
path
,
...
...
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