Commits · ae8f645b8f4abd5ec5fb1933c4ab41379374388b · nexedi / gitlab-ce · GitLab

16 Nov, 2016 25 commits
- 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
- 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
- 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 15 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
- Remove unused object key param. · 5804f3fe
  Bryce Johnson authored Nov 15, 2016
  
  5804f3fe
- Organize and comment time tracking computed values. · dbae156f
  Bryce Johnson authored Nov 15, 2016
  
  dbae156f
- Map timePeriodConstraints to parsedTime. · 6b922831
  Bryce Johnson authored Nov 15, 2016
  
  6b922831
- Get timetracking running smoothly with backend. · 6b17dc25
  Bryce Johnson authored Nov 15, 2016
  
  6b17dc25
- Initialize timetracker without mock data. · f5302cdd
  Bryce Johnson authored Nov 15, 2016
  
  f5302cdd
- Merge branch 'master' into time-tracking-integration · 3d653361
  Bryce Johnson authored Nov 15, 2016
  
  3d653361
- Merge branch 'time-tracking-backend' into time-tracking-integration · 12b6777d
  Ruben Davila authored Nov 15, 2016
  
  12b6777d
- Return the attrs that have been updated by slash command in JSON payload. · 16f6bf36
  Ruben Davila authored Nov 15, 2016
  
  16f6bf36
- Fix broken specs plus some refactoring. · 658fc330
  Ruben Davila authored Nov 14, 2016
  
  658fc330
- Update CHANGELOG.md for 8.14.0-rc2 · 12a87450
  Alejandro Rodríguez authored Nov 14, 2016
```
[ci skip]
```
  12a87450
- Update CHANGELOG-EE.md for 8.14.0-rc2-ee · d34e9cad
  Alejandro Rodríguez authored Nov 14, 2016
```
[ci skip]
```
  d34e9cad
- Update CHANGELOG.md for 8.14.0-rc2 · fd430687
  Alejandro Rodríguez authored Nov 14, 2016
```
[ci skip]
```
  fd430687
- Update CHANGELOG-EE.md for 8.14.0-rc2-ee · e221568b
  Alejandro Rodríguez authored Nov 14, 2016
```
[ci skip]
```
  e221568b