Commits · 312e3b1e16d479e1b64878cd6f8a17ff4a9fad05 · Tatuya Kamada / gitlab-ce

26 Nov, 2015 10 commits
- Merge branch 'master' of https://github.com/gitlabhq/gitlabhq · 312e3b1e
  Stan Hu authored Nov 26, 2015
  
  312e3b1e
- Merge pull request #9670 from janten/gravatar-retina · 2f90e71f
  Stan Hu authored Nov 26, 2015
```
Add support for HiDPI displays in gravatar service
```
  2f90e71f
- Merge branch 'rs-markdown-preview' into 'master' · 68a45338
  Douwe Maan authored Nov 26, 2015
```
Decouple Markdown previews from DropzoneInput



See merge request !1908
```
  68a45338
- Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow' · c887045c
  Douwe Maan authored Nov 26, 2015
  
  c887045c
- Merge branch 'rs-remove-enumerize' into 'master' · 1befbbf5
  Dmitriy Zaporozhets authored Nov 26, 2015
```
Remove enumerize gem

Closes #2803 

See merge request !1912
```
  1befbbf5
- Merge branch 'rs-update-asana' into 'master' · 21003c0c
  Dmitriy Zaporozhets authored Nov 26, 2015
```
Bump asana to ~> 0.4.0

Closes #2830

See merge request !1911
```
  21003c0c
- Merge branch 'rs-update-doorkeeper' into 'master' · b501ce04
  Dmitriy Zaporozhets authored Nov 26, 2015
```
Bump doorkeeper to ~> 2.2.0

Closes #2746

See merge request !1910
```
  b501ce04
- Merge branch 'fix-dup-changelog-entry' into 'master' · 1a8d4ded
  Stan Hu authored Nov 26, 2015
```
Remove duplicate CHANGELOG entry shipped in 8.1.4



See merge request !1914
```
  1a8d4ded
- Remove duplicate entry shipped in 8.1.4 · 7adfb30c
  Stan Hu authored Nov 25, 2015
  
  7adfb30c
- Merge branch 'rs-rescueexception-cop' into 'master' · 6bc38b9c
  Dmitriy Zaporozhets authored Nov 26, 2015
```
Enable the Lint/RescueException cop



See merge request !1894
```
  6bc38b9c
25 Nov, 2015 24 commits
- Remove enumerize gem · 5f0d1f30
  Robert Speicher authored Nov 25, 2015
  
  5f0d1f30
- Bump asana to ~> 0.4.0 · 91c0aa5e
  Robert Speicher authored Nov 25, 2015
```
Closes #2830
```
  91c0aa5e
- Bump doorkeeper to ~> 2.2.0 · 59cc61e2
  Robert Speicher authored Nov 25, 2015
```
Closes #2746
```
  59cc61e2
- Decouple Markdown previews from DropzoneInput · 73eca2a9
  Robert Speicher authored Nov 25, 2015
  
  73eca2a9
- Fix raw private snippets access workflow · 8dcef120
  Douglas Barbosa Alexandre authored Nov 25, 2015
  
  8dcef120
- Merge branch 'new-member-page' into 'master' · dee28c50
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Improve group and project members pages

* Improve UI for group members page
* Improve UI for project members page

For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057

This MR should solve usability problem with adding new member to group/project 

See merge request !1886
```
  dee28c50
- Merge branch 'bump-gitlab-shell' into 'master' · 913b408c
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Bump gitlab-shell to 2.6.8
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For gitlab/gitlabhq#2635

See merge request !1939
```
  913b408c
- Bump gitlab-shell to 2.6.8 · 18a5f91e
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  18a5f91e
- Merge branch 'sherlock-total-query-time' into 'master' · ef2bc0f0
  Yorick Peterse authored Nov 25, 2015
```
Added total query time to Sherlock

This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).

See merge request !1887
```
  ef2bc0f0
- Fix rubocop complain · acad9d67
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  acad9d67
- Split group feature tests · d262daa4
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d262daa4
- Refactor group steps · 561634c7
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  561634c7
- Refactor group members tests a bit · ea7467d2
  Dmitriy Zaporozhets authored Nov 24, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ea7467d2
- Improve project members page UI · 34cc8f4a
  Dmitriy Zaporozhets authored Nov 24, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  34cc8f4a
- Improve UI for group members page · d9749c8d
  Dmitriy Zaporozhets authored Nov 24, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d9749c8d
- Merge branch 'lfs-doc' into 'master' · 4cfc3df5
  Robert Schilling authored Nov 25, 2015
```
Add reference to Microsoft's Git Credential Manager for Windows.

Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows.

See merge request !1892
```
  4cfc3df5
- Merge branch 'rs-update-colorize' into 'master' · 3fd885fd
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Bump colorize to ~> 0.7.0

Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822

See merge request !1895
```
  3fd885fd
- Merge branch 'rs-update-rack-oauth2' into 'master' · 85d537ac
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Bump rack-oauth2 to ~> 1.2.1

Closes #2748

See merge request !1891
```
  85d537ac
- Merge branch 'rs-update-creole' into 'master' · cbdccf66
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Bump creole to ~> 0.5.0

Closes #2815

See merge request !1890
```
  cbdccf66
- Merge branch 'rs-update-gon' into 'master' · 1c8fa3b2
  Dmitriy Zaporozhets authored Nov 25, 2015
```
Bump gon to ~> 6.0.1

Closes #2856

See merge request !1889
```
  1c8fa3b2
- Merge branch 'session_expire_delay_cannot_be_nil' into 'master' · 5288fbe4
  Robert Speicher authored Nov 25, 2015
```
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

See merge request !1880
```
  5288fbe4
- Enable the Lint/RescueException cop · 767bd6f8
  Robert Speicher authored Nov 24, 2015
  
  767bd6f8
- Merge branch 'rs-rescue-standarderror' into 'master' · 9a4ae859
  Robert Speicher authored Nov 25, 2015
```
Rescue StandardError, not Exception

See merge request !1893
```
  9a4ae859
- Remove usage of Colored · ec002e80
  Robert Speicher authored Nov 24, 2015
  
  ec002e80
24 Nov, 2015 6 commits
- Bump colorize to ~> 0.7.0 · 28de6770
  Robert Speicher authored Nov 24, 2015
```
Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822
```
  28de6770
- Rescue StandardError, not Exception · a2915aeb
  Robert Speicher authored Nov 24, 2015
  
  a2915aeb
- Add reference to Microsoft's Git Credential Manager for Windows. · b9828278
  Eirik Lygre authored Nov 24, 2015
  
  b9828278
- Bump rack-oauth2 to ~> 1.2.1 · 446a95d3
  Robert Speicher authored Nov 24, 2015
  
  446a95d3
- Bump creole to ~> 0.5.0 · 26f9dbf8
  Robert Speicher authored Nov 24, 2015
```
Closes #2815
```
  26f9dbf8
- Bump gon to ~> 6.0.1 · 776027e4
  Robert Speicher authored Nov 24, 2015
```
Closes #2856
```
  776027e4