提交 · 7f214cee74796ceaf7b01bd6e133d4d54c5123db · 李少辉-开发者 / gitlab-foss

26 11月, 2015 14 次提交
- V
  
  Migrate mailers to ActiveJob · 7f214cee
  由 Valery Sizov 提交于 11月 26, 2015
  
  7f214cee
- V
  
  Merge remote-tracking branch 'origin/master' into rails_update_to_4_2 · 3e0fe276
  由 Valery Sizov 提交于 11月 26, 2015
  
  3e0fe276
- V
  
  update test_after_commit gem to 0.4.2 · 38489d8d
  由 Valery Sizov 提交于 11月 26, 2015
  
  38489d8d
- D
  Merge branch 'rs-remove-enumerize' into 'master' · 1befbbf5
  由 Dmitriy Zaporozhets 提交于 11月 26, 2015
```
Remove enumerize gem

Closes #2803 

See merge request !1912
```
  1befbbf5
- D
  Merge branch 'rs-update-asana' into 'master' · 21003c0c
  由 Dmitriy Zaporozhets 提交于 11月 26, 2015
```
Bump asana to ~> 0.4.0

Closes #2830

See merge request !1911
```
  21003c0c
- D
  Merge branch 'rs-update-doorkeeper' into 'master' · b501ce04
  由 Dmitriy Zaporozhets 提交于 11月 26, 2015
```
Bump doorkeeper to ~> 2.2.0

Closes #2746

See merge request !1910
```
  b501ce04
- S
  Merge branch 'fix-dup-changelog-entry' into 'master' · 1a8d4ded
  由 Stan Hu 提交于 11月 26, 2015
```
Remove duplicate CHANGELOG entry shipped in 8.1.4



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



See merge request !1894
```
  6bc38b9c
- R
  
  Remove enumerize gem · 5f0d1f30
  由 Robert Speicher 提交于 11月 25, 2015
  
  5f0d1f30
- R
  Bump asana to ~> 0.4.0 · 91c0aa5e
  由 Robert Speicher 提交于 11月 25, 2015
```
Closes #2830
```
  91c0aa5e
- R
  Bump doorkeeper to ~> 2.2.0 · 59cc61e2
  由 Robert Speicher 提交于 11月 25, 2015
```
Closes #2746
```
  59cc61e2
- D
  Merge branch 'new-member-page' into 'master' · dee28c50
  由 Dmitriy Zaporozhets 提交于 11月 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
- V
  
  Rails update to 4.2.4 · 40ff1318
  由 Valery Sizov 提交于 11月 25, 2015
  
  40ff1318
25 11月, 2015 26 次提交
- D
  Merge branch 'bump-gitlab-shell' into 'master' · 913b408c
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Bump gitlab-shell to 2.6.8
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For gitlab/gitlabhq#2635

See merge request !1939
```
  913b408c
- D
  Bump gitlab-shell to 2.6.8 · 18a5f91e
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  18a5f91e
- Y
  Merge branch 'sherlock-total-query-time' into 'master' · ef2bc0f0
  由 Yorick Peterse 提交于 11月 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
- D
  Fix rubocop complain · acad9d67
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  acad9d67
- D
  Split group feature tests · d262daa4
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d262daa4
- D
  Refactor group steps · 561634c7
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  561634c7
- D
  Refactor group members tests a bit · ea7467d2
  由 Dmitriy Zaporozhets 提交于 11月 24, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ea7467d2
- D
  Improve project members page UI · 34cc8f4a
  由 Dmitriy Zaporozhets 提交于 11月 24, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  34cc8f4a
- D
  Improve UI for group members page · d9749c8d
  由 Dmitriy Zaporozhets 提交于 11月 24, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d9749c8d
- R
  Merge branch 'lfs-doc' into 'master' · 4cfc3df5
  由 Robert Schilling 提交于 11月 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
- D
  Merge branch 'rs-update-colorize' into 'master' · 3fd885fd
  由 Dmitriy Zaporozhets 提交于 11月 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
- D
  Merge branch 'rs-update-rack-oauth2' into 'master' · 85d537ac
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Bump rack-oauth2 to ~> 1.2.1

Closes #2748

See merge request !1891
```
  85d537ac
- D
  Merge branch 'rs-update-creole' into 'master' · cbdccf66
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Bump creole to ~> 0.5.0

Closes #2815

See merge request !1890
```
  cbdccf66
- D
  Merge branch 'rs-update-gon' into 'master' · 1c8fa3b2
  由 Dmitriy Zaporozhets 提交于 11月 25, 2015
```
Bump gon to ~> 6.0.1

Closes #2856

See merge request !1889
```
  1c8fa3b2
- R
  Merge branch 'session_expire_delay_cannot_be_nil' into 'master' · 5288fbe4
  由 Robert Speicher 提交于 11月 25, 2015
```
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

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

See merge request !1893
```
  9a4ae859
- R
  
  Remove usage of Colored · ec002e80
  由 Robert Speicher 提交于 11月 24, 2015
  
  ec002e80
- R
  Bump colorize to ~> 0.7.0 · 28de6770
  由 Robert Speicher 提交于 11月 24, 2015
```
Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822
```
  28de6770
- R
  
  Rescue StandardError, not Exception · a2915aeb
  由 Robert Speicher 提交于 11月 24, 2015
  
  a2915aeb
- E
  
  Add reference to Microsoft's Git Credential Manager for Windows. · b9828278
  由 Eirik Lygre 提交于 11月 24, 2015
  
  b9828278
- R
  
  Bump rack-oauth2 to ~> 1.2.1 · 446a95d3
  由 Robert Speicher 提交于 11月 24, 2015
  
  446a95d3
- R
  Bump creole to ~> 0.5.0 · 26f9dbf8
  由 Robert Speicher 提交于 11月 24, 2015
```
Closes #2815
```
  26f9dbf8
- R
  Bump gon to ~> 6.0.1 · 776027e4
  由 Robert Speicher 提交于 11月 24, 2015
```
Closes #2856
```
  776027e4
- D
  Merge branch 'fix-group-member' into 'master' · 0fb5ffd8
  由 Dmitriy Zaporozhets 提交于 11月 24, 2015
```
Fix 500 error when update group member permission
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #3578 

See merge request !1884
```
  0fb5ffd8
- D
  Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' · 6d5d45ad
  由 Dmitriy Zaporozhets 提交于 11月 24, 2015
```
Spell out commands for omnibus-gitlab packages.

User got confused in gitlab-org/gitlab-ce#3614

See merge request !1881
```
  6d5d45ad