Commits · 75b5343ab936b2bebb79f30d762f8e48ccd12acb · nexedi / gitlab-ce

08 Apr, 2017 7 commits
- Update rubocop-rspec 1.12.0 -> 1.15.0 · 75b5343a
  Robert Speicher authored Apr 07, 2017
  
  75b5343a
- Merge branch 'ee-new-resolvable-discussion' into 'master' · 5b6fa73a
  Douwe Maan authored Apr 08, 2017
```
EE port of "Start discussion"

See merge request !1556
```
  5b6fa73a
- Add option to start a new discussion · fe2901f1
  Douwe Maan authored Apr 07, 2017
  
  fe2901f1
- Merge branch 'update-droplab-to-webpack-version-ee' into 'master' · f8e8d738
  Douwe Maan authored Apr 08, 2017
```
Update droplab to webpack version ee

See merge request !1608
```
  f8e8d738
- remove old droplab_filter · 3d227db8
  Mike Greiling authored Apr 07, 2017
  
  3d227db8
- Merge branch 'button-capitalization-ee' into 'master' · 1817f80a
  Clement Ho authored Apr 08, 2017
```
Port of button-capitalisation for EE

See merge request !1590
```
  1817f80a
- Fix spec · 17e49e65
  Douwe Maan authored Apr 07, 2017
  
  17e49e65
07 Apr, 2017 33 commits
- Merge branch 'dm-copy-diff-file-title-as-gfm-ee' into 'master' · 2e21bc12
  Robert Speicher authored Apr 07, 2017
```
EE port of "Copy diff file path as GFM"

See merge request !1589
```
  2e21bc12
- EE port of "Copy diff file path as GFM" · 350d2b19
  Douwe Maan authored Apr 07, 2017
  
  350d2b19
- Corrected yarn.lock · 373d78bb
  Luke "Jared" Bennett authored Apr 07, 2017
  
  373d78bb
- Renamed spec files · 3cf500cf
  Luke "Jared" Bennett authored Apr 07, 2017
  
  3cf500cf
- Update inputsetter · aca0819f
  Luke "Jared" Bennett authored Apr 06, 2017
  
  aca0819f
- Fixed error handling · 32f5fe53
  Luke "Jared" Bennett authored Apr 06, 2017
  
  32f5fe53
- Added droplab back to static assets · db8c0b58
  Luke "Jared" Bennett authored Apr 06, 2017
  
  db8c0b58
- Added droplab to yarn.lock and package.json · 163649f2
  Luke "Jared" Bennett authored Apr 05, 2017
  
  163649f2
- Prep for moving droplab to npm · c76daed5
  Luke "Jared" Bennett authored Mar 25, 2017
  
  c76daed5
- update droplab · bf7dc5af
  Luke "Jared" Bennett authored Mar 25, 2017
  
  bf7dc5af
- Updated droplab version to webpack version · ea04ba59
  Luke "Jared" Bennett authored Feb 19, 2017
  
  ea04ba59
- Merge branch 'user-cohorts' into 'master' · 7c5ba0f9
  Stan Hu authored Apr 07, 2017
```
Add user cohorts table to admin area

Closes gitlab-ce#29551

See merge request !1545
```
  7c5ba0f9
- Merge branch 'open-deployboards-by-default' into 'master' · 86d1e55e
  Clement Ho authored Apr 07, 2017
```
Make deploy board be visible by default

Closes #2106

See merge request !1595
```
  86d1e55e
- Make deploy board be visible by default · 1d9ab992
  Kamil Trzciński authored Apr 07, 2017
  
  1d9ab992
- Port of button-capitalization for EE · c99ccc9c
  Jose Ivan Vargas authored Apr 03, 2017
  
  c99ccc9c
- Merge branch 'ee-update-trace-handling-code' into 'master' · b1fb6dec
  Rémy Coutable authored Apr 07, 2017
```
Merge remote-tracking branch 'origin/master' into update-trace-handling-code

See merge request !1580
```
  b1fb6dec
- Merge branch 'service_desk_usage_ping' into 'master' · 7d144dc0
  Sean McGivern authored Apr 07, 2017
```
Service desk usage ping

Closes #1706

See merge request !1588
```
  7d144dc0
- Fix doc links · a47d5937
  Sean McGivern authored Apr 07, 2017
  
  a47d5937
- Merge branch '2055-lfs-objects-being-counted-twice' into 'master' · ce0fb87c
  Douwe Maan authored Apr 07, 2017
```
removes the duplicate sum of lfs objects

Closes #2055

See merge request !1599
```
  ce0fb87c
- Merge branch 'service-desk-fe-updates-v1' into 'master' · 000037cb
  Sean McGivern authored Apr 07, 2017
```
Service Desk FE updates v1

See merge request !1604
```
  000037cb
- Merge branch 'docs/ci-variables-remove-my-email' into 'master' · e4cb7156
  Achilleas Pipinellis authored Apr 07, 2017
```
Remove wrong user email from CI variables example output

See merge request !1606
```
  e4cb7156
- Use last_activity_on in cohorts · c8c96813
  Sean McGivern authored Apr 07, 2017
  
  c8c96813
- Remove wrong user email from CI variables example output · 00219197
  Achilleas Pipinellis authored Apr 07, 2017
```
[ci skip]
```
  00219197
- Merge branch 'master' into user-cohorts · b5e496bb
  Sean McGivern authored Apr 07, 2017
  
  b5e496bb
- Merge branch... · e4fec520
  Sean McGivern authored Apr 07, 2017
```
Merge branch '27790-periodically-save-last-activity-date-data-from-redis-to-the-database-hscan' into 'master'

[Improved] Periodically save last activity date data from Redis to the database

See merge request !1597
```
  e4fec520
- Retrieve service desk usage from instances · cb4a9f8a
  Felipe Artur authored Apr 06, 2017
  
  cb4a9f8a
- Add missing links in the documentation · 34d3e320
  Regis Freyd authored Apr 07, 2017
  
  34d3e320
- Fix rubocop failure · 3d42f87e
  Kamil Trzcinski authored Apr 07, 2017
  
  3d42f87e
- Actually unbind and better undefined checking · 07a7d88e
  Eric Eastwood authored Apr 07, 2017
```
Thanks @jschatz1 for the review
```
  07a7d88e
- Merge remote-tracking branch 'origin-ee/master' into ee-update-trace-handling-code · 57fb24f0
  Kamil Trzcinski authored Apr 07, 2017
  
  57fb24f0
- Add a post-deploy migration to migrate from former Redis activity to DB · fca21718
  Rémy Coutable authored Mar 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fca21718
- Expose `last_activity_on` in the User API · 63695d43
  Rémy Coutable authored Mar 27, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  63695d43
- Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker · 67149e58
  Rémy Coutable authored Mar 07, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  67149e58