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
ae7d3c63
Commit
ae7d3c63
authored
Nov 17, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up markup and comments.
parent
ce8bae43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/assets/javascripts/issuable_time_tracker.js.es6
app/assets/javascripts/issuable_time_tracker.js.es6
+3
-3
spec/javascripts/issuable_time_tracker_spec.js.es6
spec/javascripts/issuable_time_tracker_spec.js.es6
+1
-2
No files found.
app/assets/javascripts/issuable_time_tracker.js.es6
View file @
ae7d3c63
...
...
@@ -108,11 +108,11 @@
<div :style='{ width: diffPercent }' class='meter-fill'></div>
</div>
<div class='compare-display-container'>
<div class='compare-display'>
<div class='compare-display
pull-left
'>
<span class='compare-label'>Spent</span>
<span class='compare-value spent'>{{ spentPretty }}</span>
</div>
<div class='compare-display estimated'>
<div class='compare-display estimated
pull-right
'>
<span class='compare-label'>Est</span>
<span class='compare-value'>{{ estimatedPretty }}</span>
</div>
...
...
@@ -145,7 +145,7 @@
<code>/spend</code>
will update the sum of the time spent.
</p>
<a class='btn btn-default learn-more-button' href='http
s://docs.gitlab.com/ee/workflow/time_tracking.html'> Learn more
</a>
<a class='btn btn-default learn-more-button' href='http
://example.com/time-tracking-url'>Learn more
</a>
</div>
</div>
</div>
...
...
spec/javascripts/issuable_time_tracker_spec.js.es6
View file @
ae7d3c63
...
...
@@ -2,7 +2,6 @@
//= require jquery
//= require vue
//= require issuable_time_tracker
//= require directives/tooltip_title
function initComponent(time_estimate = 100000, time_spent = 5000 ) {
fixture.set(`
...
...
@@ -167,7 +166,7 @@ function initComponent(time_estimate = 100000, time_spent = 5000 ) {
});
it('should link to the correct documentation', function(done) {
const correctUrl = 'http
s://docs.gitlab.com/ee/workflow/time_tracking.htm
l';
const correctUrl = 'http
://example.com/time-tracking-ur
l';
$(this.timeTracker.$el).find('.help-button').click();
...
...
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