提交 · 0bcabdaf8330d0a260d95ee8435170fa7258eb98 · 李少辉-开发者 / gitlab-foss

12 2月, 2014 15 次提交
- D
  Use gitlab_git 5.4.0 without BROKEN_DIFF constant · 0bcabdaf
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0bcabdaf
- D
  Merge pull request #6298 from ralish/hipchat-spelling-fix · bb44a7a2
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
```
Fix spelling of "GitLab" in HipChat service
```
  bb44a7a2
- D
  Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions · 168e0341
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
```
add rake gitlab:import: all_users_to_all_groups and user_to_groups
```
  168e0341
- S
  Fix spelling of "GitLab" in HipChat service · a5c62585
  由 Samuel D. Leslie 提交于 2月 12, 2014
```
Pedantic, but it frustrates OCD people like myself :)
```
  a5c62585
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 5b0aa252
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
  
  5b0aa252
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 8de11d88
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
  
  8de11d88
- D
  Merge branch 'asset-path-in-scss' into 'master' · 331d9576
  由 Dmitriy Zaporozhets 提交于 2月 12, 2014
```
 Use rails scss image-url herlper
```
  331d9576
- S
  Merge branch 'fix-projects-spelling' into 'master' · de0abc0b
  由 Sytse Sijbrandij 提交于 2月 11, 2014
```
Fix spelling of plural project (projects and not project's).

Just a minor spelling error.
```
  de0abc0b
- D
  Merge pull request #6297 from jojosch/user-public-ssh-keys-newline · 1bcf0aa2
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
Split the user ssh keys by newline, not the characters "\n"
```
  1bcf0aa2
- D
  Restore old padding for wiki blocks · d39948a8
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d39948a8
- D
  Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into... · c61512d4
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  c61512d4
- D
  Merge branch 'bug/gravatr_select2' into 'master' · 6e47fbf5
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
Dont use gravatars for user select if gravatar is disabled

Fixes #836
```
  6e47fbf5
- J
  Split the user ssh keys by newline, not the characters "\n" · f1015381
  由 Johannes Schleifenbaum 提交于 2月 11, 2014
```
before:
GET /user.keys

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

after:
GET /user.keys

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

Conflicts:
	doc/update/upgrader.md
```
  e1c1e882
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 5966f5bb
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
  
  5966f5bb
- D
  
  Require a full yes. · f1da402b
  由 dosire 提交于 2月 11, 2014
  
  f1da402b
- P
  
  Fix spelling of plural project (projects and not project's). · 9d3d0a9e
  由 Pixelindustries 提交于 2月 11, 2014
  
  9d3d0a9e
- D
  Merge branch 'we-hate-options' into 'master' · 51ed906d
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
We Hate Options
```
  51ed906d
- S
  Merge pull request #5975 from terrywang/fix-update-doc · 34569438
  由 Sytse Sijbrandij 提交于 2月 11, 2014
```
Fix numbering in 6.3-to-6.4.md
```
  34569438
- D
  
  We do not like configuration options. · 41adbc0b
  由 dosire 提交于 2月 11, 2014
  
  41adbc0b
- D
  Fix new password page UI · faafde2d
  由 Dmitriy Zaporozhets 提交于 2月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  faafde2d
- D
  Merge branch 'feature/blob_last_commit' into 'master' · 1af84f8c
  由 Dmitriy Zaporozhets 提交于 2月 10, 2014
```
Feature: show last commit for Blob#show

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

Fixes #1028
```
  657eb7ba
- D
  Merge branch 'ace_editor' into 'master' · c10a35c4
  由 Dmitriy Zaporozhets 提交于 2月 10, 2014
```
Ace Editor as gem
```
  c10a35c4
10 2月, 2014 1 次提交
- D
  Fix dashboard atom feed · 5e30f4d5
  由 Dmitriy Zaporozhets 提交于 2月 10, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e30f4d5