Commits · 8de11d88ebadbe18803d58b502a20d8d02177f89 · Boxiang Sun / gitlab-ce

12 Feb, 2014 2 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 8de11d88
  Dmitriy Zaporozhets authored Feb 12, 2014
  
  8de11d88
- Merge branch 'asset-path-in-scss' into 'master' · 331d9576
  Dmitriy Zaporozhets authored Feb 12, 2014
```
 Use rails scss image-url herlper
```
  331d9576
11 Feb, 2014 25 commits
- Merge pull request #6297 from jojosch/user-public-ssh-keys-newline · 1bcf0aa2
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Split the user ssh keys by newline, not the characters "\n"
```
  1bcf0aa2
- Restore old padding for wiki blocks · d39948a8
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d39948a8
- Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into... · c61512d4
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  c61512d4
- Merge branch 'bug/gravatr_select2' into 'master' · 6e47fbf5
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Dont use gravatars for user select if gravatar is disabled

Fixes #836
```
  6e47fbf5
- Split the user ssh keys by newline, not the characters "\n" · f1015381
  Johannes Schleifenbaum authored Feb 11, 2014
```
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
```
  f1015381
- Merge pull request #6177 from cirosantilli/public-user-pages · 39aeac71
  Dmitriy Zaporozhets authored Feb 11, 2014
```
User pages are public
```
  39aeac71
- Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh · aef78288
  Dmitriy Zaporozhets authored Feb 11, 2014
```
ssh keys publically available for sysadmins via http, the github way
```
  aef78288
- remove unwanted spaces, reduce diff, clean before merge · 4b9c28bc
  GitLab authored Feb 11, 2014
  
  4b9c28bc
- Headers have ids and link to their own id. · 61748c99
  Ciro Santillli authored Feb 04, 2014
  
  61748c99
- User pages are visible to users without login · 91571c07
  Ciro Santillli authored Jan 27, 2014
```
... if the user is authorized to at least one public project.
```
  91571c07
- Use rails image-url herlper · 3b8b396c
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3b8b396c
- Dont use avatars for user select if avatar is disabled · 348e44ef
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  348e44ef
- Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into... · 1739b7fc
  GitLab authored Feb 11, 2014
```
Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into retrieve_ssh_keys_by_ssh
```
  1739b7fc
- code refactor as per standards · 46ad09bf
  GitLab authored Feb 11, 2014
  
  46ad09bf
- Merge pull request #6264 from robertd/update_upgrade_guide · 1284f21c
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Update upgrade guide if you have more than one backup .tar file
```
  1284f21c
- Merge pull request #6087 from pgolm/fix/link_to_merge_request_diff_line_note · 9e6f4d36
  Dmitriy Zaporozhets authored Feb 11, 2014
```
fix: link_to_merge_request_diff_line_note
```
  9e6f4d36
- Merge pull request #6249 from babatakao/fix_500_in_ruby19 · 0b0ba8be
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Fix 500 error in Ruby 1.9.
```
  0b0ba8be
- Update api project documentation to include project name as attribute. · 441e6dcf
  Marin Jankovski authored Feb 11, 2014
  
  441e6dcf
- Merge branch 'layout-of-upgrader' · e1c1e882
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/upgrader.md
```
  e1c1e882
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 5966f5bb
  Dmitriy Zaporozhets authored Feb 11, 2014
  
  5966f5bb
- Require a full yes. · f1da402b
  dosire authored Feb 11, 2014
  
  f1da402b
- Merge branch 'we-hate-options' into 'master' · 51ed906d
  Dmitriy Zaporozhets authored Feb 11, 2014
```
We Hate Options
```
  51ed906d
- Merge pull request #5975 from terrywang/fix-update-doc · 34569438
  Sytse Sijbrandij authored Feb 11, 2014
```
Fix numbering in 6.3-to-6.4.md
```
  34569438
- We do not like configuration options. · 41adbc0b
  dosire authored Feb 11, 2014
  
  41adbc0b
- Fix new password page UI · faafde2d
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  faafde2d
10 Feb, 2014 13 commits
- Merge branch 'feature/blob_last_commit' into 'master' · 1af84f8c
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Feature: show last commit for Blob#show

Fixes #970
```
  1af84f8c
- Show last commit for Blob#show · 9a3d6659
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9a3d6659
- Merge pull request #6276 from robertd/update_changelog · 35fb7d54
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Update changelog for #6267
```
  35fb7d54
- Merge branch 'bug/filtering_service' into 'master' · 657eb7ba
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Fix wrong issues appears at Dashboard#issues page

Fixes #1028
```
  657eb7ba
- Merge branch 'ace_editor' into 'master' · c10a35c4
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Ace Editor as gem
```
  c10a35c4
- Fix dashboard atom feed · 5e30f4d5
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e30f4d5
- Use ace editor as gem · 1794f606
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1794f606
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · baf8afc6
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  baf8afc6
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 8342f73d
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  8342f73d
- Merge pull request #6284 from Razer6/fix_grammer_in_mr_page · 6cf24ba9
  Sytse Sijbrandij authored Feb 10, 2014
```
Fixes #6073, Update grammer in MR accept form
```
  6cf24ba9
- Merge pull request #6283 from Razer6/fix_dead_links · 189ae623
  Sytse Sijbrandij authored Feb 10, 2014
```
Fixes #6187, Update dead links
```
  189ae623
- Fix Issues#bulk_update · 58ac731c
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  58ac731c
- Add more tests for FilteringService · ec437ad9
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ec437ad9