Commits · e0131c5d07f22681e4118473dbfa0dd93df12b28 · Tatuya Kamada / gitlab-ce

30 Nov, 2015 12 commits
- Merge branch 'rails_update_to_4_2' into 'master' · e0131c5d
  Valery Sizov authored Nov 30, 2015
```
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
```
  e0131c5d
- test fix · f1504e1a
  Valery Sizov authored Nov 30, 2015
  
  f1504e1a
- fix specs · e92ceb7b
  Valery Sizov authored Nov 30, 2015
  
  e92ceb7b
- Merge branch 'rs-build-ssh-path-prefix' into 'master' · a8e05cec
  Douwe Maan authored Nov 30, 2015
```
Simplify `build_gitlab_shell_ssh_path_prefix`



See merge request !1928
```
  a8e05cec
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · d73d2a5e
  Dmitriy Zaporozhets authored Nov 30, 2015
  
  d73d2a5e
- Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' · f41634c7
  Dmitriy Zaporozhets authored Nov 30, 2015
```
Show Gmail actions links only on expected set of emails



See merge request !1901
```
  f41634c7
- Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce · 69e9c414
  Dmitriy Zaporozhets authored Nov 30, 2015
  
  69e9c414
- fix notification_service specs · 461731f0
  Valery Sizov authored Nov 30, 2015
  
  461731f0
- Merge branch 'fix-admin-page-personal-projects' into 'master' · c48518ac
  Dmitriy Zaporozhets authored Nov 30, 2015
```
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00fd.

Closes #3680

Closes https://github.com/gitlabhq/gitlabhq/issues/9861

Closes gitlab-org/gitlab-ee#90

See merge request !1909
```
  c48518ac
- Merge branch 'rs-clone-panel' into 'master' · 0a1b50ef
  Dmitriy Zaporozhets authored Nov 30, 2015
```
Add clipboard button for project clone panel

Closes #3585 

Project:

![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png)

Wiki:

![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png)


See merge request !1896
```
  0a1b50ef
- Merge branch 'rs-update-jquery-turbolinks' into 'master' · 2abe9598
  Dmitriy Zaporozhets authored Nov 30, 2015
```
Bump jquery-turbolinks to ~> 2.1.0

See #2857

See merge request !1922
```
  2abe9598
- Merge branch 'phantomjs' into 'master' · b4d40c16
  Dmitriy Zaporozhets authored Nov 30, 2015
```
Use new phantomjs source

Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages.

Fixes #3722

See merge request !1924
```
  b4d40c16
29 Nov, 2015 3 commits
- Simplify `build_gitlab_shell_ssh_path_prefix` · e1522ec8
  Robert Speicher authored Nov 29, 2015
  
  e1522ec8
- Test using a 1.9.8 phantomjs version built with fpm · bb6ce2bb
  Achilleas Pipinellis authored Nov 29, 2015
```
https://gitlab.com/axil/phantomjs-debian
```
  bb6ce2bb
- Update phantomjs to 2.0.0 · 7d6323a9
  Achilleas Pipinellis authored Nov 29, 2015
```
* Version 1.9 was removed from upstream Debian repos
```
  7d6323a9
28 Nov, 2015 3 commits
- Merge branch 'remove-satellites-reference' into 'master' · 15291c89
  Achilleas Pipinellis authored Nov 28, 2015
```
Remove reverence to satellites

Remove reference in backup docs

See merge request !1923
```
  15291c89
- Remove reverence to satellites [ci skip] · 85ad2140
  Robert Schilling authored Nov 28, 2015
  
  85ad2140
- Merge branch 'doc_public_access' into 'master' · db1fe56a
  Sytse Sijbrandij authored Nov 28, 2015
```
Update public access documentation



See merge request !1837
```
  db1fe56a
27 Nov, 2015 7 commits
- Bump jquery-turbolinks to ~> 2.1.0 · 344cb897
  Robert Speicher authored Nov 27, 2015
```
See #2857
```
  344cb897
- Move project visibility level off of the clone panel · 3723182a
  Robert Speicher authored Nov 27, 2015
  
  3723182a
- Merge branch 'nginx-workhorse-upload-limit' into 'master' · 3c2914b4
  Robert Speicher authored Nov 27, 2015
```
Nginx workhorse upload limit

See merge request !1919
```
  3c2914b4
- Fix alignment · f1710073
  Robert Speicher authored Nov 27, 2015
```
[ci skip]
```
  f1710073
- Fix indentation in NGINX config · 04049b6b
  Jacob Vosmaer authored Nov 27, 2015
  
  04049b6b
- Repeat "client_max_body_size 0" everywhere · 295d378e
  Jacob Vosmaer authored Nov 27, 2015
```
It turns out that if we do not the declaration from
"location /" wins.
```
  295d378e
- Merge branch 'jcorcuera/gitlab-ce-issue_3428' · 8f4b6d51
  Douwe Maan authored Nov 27, 2015
  
  8f4b6d51
26 Nov, 2015 15 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
- Gracefully handle when Redis is not available · 78c1ab40
  Stan Hu authored Nov 26, 2015
  
  78c1ab40
- Strip attributes for Milestone and Issuable. #3428 · b9df1a63
  Jose Corcuera authored Nov 26, 2015
  
  b9df1a63
- Migrate mailers to ActiveJob · 7f214cee
  Valery Sizov authored Nov 26, 2015
  
  7f214cee
- 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 remote-tracking branch 'origin/master' into rails_update_to_4_2 · 3e0fe276
  Valery Sizov authored Nov 26, 2015
  
  3e0fe276
- update test_after_commit gem to 0.4.2 · 38489d8d
  Valery Sizov authored Nov 26, 2015
  
  38489d8d
- 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