Commits · ef7b6de45bb01ee493e6b4bb9b0233199f0d9f57 · nexedi / gitlab-ce

17 Nov, 2016 5 commits
- Break out PrettyTime from IssuableTimeTracker. · ef7b6de4
  Bryce Johnson authored Nov 17, 2016
  
  ef7b6de4
- Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee... · 82d7d431
  Bryce Johnson authored Nov 17, 2016
```
Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee into time-tracking-integration
```
  82d7d431
- Merge branch 'time-tracking-backend' into time-tracking-integration · a1446d03
  Ruben Davila authored Nov 16, 2016
```
Conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/concerns/time_trackable.rb
	db/schema.rb
```
  a1446d03
- Fix broken specs. · 5ed1847e
  Ruben Davila authored Nov 16, 2016
  
  5ed1847e
- Refactor formatting of time and add more specs. · 80e314be
  Ruben Davila authored Nov 16, 2016
  
  80e314be
16 Nov, 2016 33 commits
- Update styles of help message and progress bar · 872601fc
  Bryce Johnson authored Nov 16, 2016
  
  872601fc
- Update "Learn more" href in timetracking template. · 67379baa
  Bryce Johnson authored Nov 16, 2016
  
  67379baa
- Fix dangling comma, curse, then thank eslint. · 0e9782cd
  Bryce Johnson authored Nov 16, 2016
  
  0e9782cd
- Update styles of help message and progress bar · 2cb3145f
  tauriedavis authored Nov 16, 2016
  
  2cb3145f
- Address suggestions from last code review. · 4d681488
  Ruben Davila authored Nov 16, 2016
```
* Added new serializers for Issue and MergeRequest.
```
  4d681488
- Update issuable_time_tracker_spec.js.es6 · 02aa5cb2
  Bryce Johnson authored Nov 16, 2016
  
  02aa5cb2
- Update "Learn more" href in timetracking template. · ae8f645b
  Bryce Johnson authored Nov 16, 2016
  
  ae8f645b
- Fix dangling comma, curse, then thank eslint. · 8101dbf0
  Bryce Johnson authored Nov 16, 2016
  
  8101dbf0
- Set more reasonable polling config. · b3582109
  Bryce Johnson authored Nov 16, 2016
  
  b3582109
- Fix require errors exposed by removing tooltip directive. · 92ede2fe
  Bryce Johnson authored Nov 16, 2016
  
  92ede2fe
- Reset interval on visibility change. · efccc3fe
  Bryce Johnson authored Nov 16, 2016
  
  efccc3fe
- Add documentation about Time Tracking · 933400e4
  Regis Freyd authored Nov 16, 2016
  
  933400e4
- Handle tooltip updates in timetracking component. · 4743f77e
  Bryce Johnson authored Nov 16, 2016
  
  4743f77e
- Enable eslint for smart_interval_spec and shush. · 66830f5c
  Bryce Johnson authored Nov 16, 2016
  
  66830f5c
- Shush eslint. · 2518af49
  Bryce Johnson authored Nov 16, 2016
  
  2518af49
- Update to use human readable values from server. · 50b16e78
  Bryce Johnson authored Nov 16, 2016
  
  50b16e78
- Remove mocking logic. · f8a09735
  Bryce Johnson authored Nov 16, 2016
  
  f8a09735
- Clean up title-tooltip directive and component. · 2fe23ad1
  Bryce Johnson authored Nov 16, 2016
  
  2fe23ad1
- Fix help state styles. · 4a006c34
  Bryce Johnson authored Nov 16, 2016
  
  4a006c34
- Improve random data config. · 129e3474
  Bryce Johnson authored Nov 16, 2016
  
  129e3474
- Break up mount hook actions. · fafc15f0
  Bryce Johnson authored Nov 16, 2016
  
  fafc15f0
- Use slot to use custom_icon helper. · ff8adc9d
  Bryce Johnson authored Nov 16, 2016
  
  ff8adc9d
- Adjust mocking logic to show all states. · dd1fdc51
  Bryce Johnson authored Nov 16, 2016
  
  dd1fdc51
- Include fallback content for loading state. · e317957b
  Bryce Johnson authored Nov 16, 2016
  
  e317957b
- Fix help state overlapping content panes. · e64cbb20
  Bryce Johnson authored Nov 16, 2016
  
  e64cbb20
- Condense time for display in stringifyTime. · d2a09844
  Bryce Johnson authored Nov 16, 2016
  
  d2a09844
- Only abbreviate non-zero values. · 79fd521b
  Bryce Johnson authored Nov 16, 2016
  
  79fd521b
- Round out tests for time tracking component. · c07e0377
  Bryce Johnson authored Nov 16, 2016
  
  c07e0377
- Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee... · 997def72
  Bryce Johnson authored Nov 16, 2016
```
Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee into time-tracking-integration
```
  997def72
- Properly break up component definition and instantiation. · 1c98d7cc
  Bryce Johnson authored Nov 16, 2016
  
  1c98d7cc
- Add helper methods to show time in a human format. · 9ac5a39c
  Ruben Davila authored Nov 15, 2016
```
Also added new attributes related to time tracking to the JSON payload.
```
  9ac5a39c
- Merge branch 'time-tracking-backend' into time-tracking-integration · c4e0a7d1
  Ruben Davila authored Nov 15, 2016
```
Conflicts:
	db/schema.rb
```
  c4e0a7d1
- Add helper methods to show time in a human format. · 877f6994
  Ruben Davila authored Nov 15, 2016
```
Also added new attributes related to time tracking to the JSON payload.
```
  877f6994
15 Nov, 2016 2 commits
- Fix inititalization and stub out specs. · 8d42889a
  Bryce Johnson authored Nov 15, 2016
  
  8d42889a
- Address feedback from last code review. · 71a9b688
  Ruben Davila authored Nov 15, 2016
  
  71a9b688