提交 · 5436d6afd614f929a67c8b0257fa1644823d55b3 · 李少辉-开发者 / gitlab-foss

07 4月, 2014 5 次提交
- D
  Make oauth works for google oauth too · 5436d6af
  由 Dmitriy Zaporozhets 提交于 4月 07, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5436d6af
- D
  Add nickname to oauth_spec · 021faad3
  由 Dmitriy Zaporozhets 提交于 4月 07, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  021faad3
- D
  Dont care about emails for oauth · 4ab32be8
  由 Dmitriy Zaporozhets 提交于 4月 07, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ab32be8
- D
  Skip require email for devise controllers · 84d17f79
  由 Dmitriy Zaporozhets 提交于 4月 07, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84d17f79
- D
  Allow oauth signup without email · a73df4f7
  由 Dmitriy Zaporozhets 提交于 4月 07, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a73df4f7
06 4月, 2014 11 次提交
- D
  Merge branch 'improve-mr-widget' into 'master' · 4e002a71
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
 Restyle merge request accept and ci widget

Fixes #1138
```
  4e002a71
- D
  Restyle merge request accept and ci widget · 8e7f80ee
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e7f80ee
- D
  Merge pull request #6705 from razielgn/slack-service-attachments · bc40efa1
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
Improved Slack integration with message attachments.
```
  bc40efa1
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 3740597f
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
  
  3740597f
- D
  Use normal btn size for test service · 7ced2eb4
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7ced2eb4
- S
  Merge pull request #5508 from jojosch/apidoc-json · 26ab17a8
  由 Sytse Sijbrandij 提交于 4月 06, 2014
```
Api-Doc and Web-Hooks JSON lint
```
  26ab17a8
- D
  Fix autocomplete css · ae2089a9
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ae2089a9
- D
  
  Merge branch 'jacob-carlborg-remove_source_branch_button' · 84a8b29f
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
  
  84a8b29f
- D
  Merge branch 'remove_source_branch_button' of... · 1a17289b
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
```
Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
```
  1a17289b
- F
  
  Improved Slack integration with message attachments. · 6a9eb4b2
  由 Federico Ravasio 提交于 4月 06, 2014
  
  6a9eb4b2
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 2ceef769
  由 Dmitriy Zaporozhets 提交于 4月 06, 2014
  
  2ceef769
05 4月, 2014 6 次提交

D

Merge branch 'master' of github.com:gitlabhq/gitlabhq · 7ae488ed
由 Dmitriy Zaporozhets 提交于 4月 05, 2014

7ae488ed
D
Merge pull request #6701 from idealhack/add-ios-icon · b01e7116
由 Dmitriy Zaporozhets 提交于 4月 05, 2014
```
Add icon for iOS home screen
```
b01e7116

Merge branch 'request/relative_submodules' into 'master' · 2f945ac5

由 Dmitriy Zaporozhets 提交于 4月 05, 2014

 Add support for relative submodules

Currently there is no support for submodules where the url starts with ./ or ../, it will fail with an Routing Error.
This is required is you don't want to force a submodule to ssh or http usage.

For a given Repository __http://server/group/root.git__

---

[submodule "sub1"]
	path = sub1
	url = ../submodule.git

Wrong: http://server/group/ __root__ /submodule.git
Correct: http://server/group/submodule.git

---

[submodule "sub2"]
	path = sub2
	url = ../../any/submodule.git

Wrong: http://server/ __group/any__ /submodule.git
Corrent: http://server/any/submodule.git

2f945ac5

J
Api-Doc JSON lint · 49addad7
由 Johannes Schleifenbaum 提交于 4月 05, 2014
```
Fixes: #5505
```
49addad7
Y

Add icon for iOS home screen · 8c7f4f2b
由 Yang Li 提交于 4月 05, 2014

8c7f4f2b
T

Merge branch 'master' into request/relative_submodules · 4d194502
由 Timm Drevensek 提交于 4月 04, 2014

4d194502

04 4月, 2014 16 次提交
- D
  Merge branch 'deduplicate-help' into 'master' · 3d2c8185
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Deduplicate help
```
  3d2c8185
- D
  Merge branch 'gems-bump' into 'master' · 64341cca
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Update gitlab_git and gitlab-grit gem versions
```
  64341cca
- S
  Merge branch 'doc/ldap' into 'master' · 7611ce72
  由 Sytse Sijbrandij 提交于 4月 04, 2014
```
Explain LDAP activation for existing users
```
  7611ce72
- J
  
  Explain how existing users can enable LDAP · bb9ec711
  由 Jacob Vosmaer 提交于 4月 04, 2014
  
  bb9ec711
- S
  Merge branch 'small-feature-requests' into 'master' · a6bc4f0c
  由 Sytse Sijbrandij 提交于 4月 04, 2014
```
Small feature requests

/cc @dzaporozhets
```
  a6bc4f0c
- D
  
  Ask for small feature requests. · e159a561
  由 dosire 提交于 4月 04, 2014
  
  e159a561
- D
  Update gitlab_git and gitlab-grit gem versions · 11f864c9
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  11f864c9
- D
  Merge pull request #5950 from axilleas/bundler_parallel · 1f1cfc9e
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Refer to bundler's ability of parallel installation
```
  1f1cfc9e
- D
  Merge pull request #6658 from tsigo/rs-important-dirs · ad3a3e52
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Make sure important directories exist in git
```
  ad3a3e52
- D
  Merge branch 'no_email_on_notification_level_change' into 'master' · 14b68586
  由 Dmitriy Zaporozhets 提交于 4月 04, 2014
```
Don't send emails on notification level change
```
  14b68586
- M
  Merge branch 'add-one-line-upgrader-command' into 'master' · a3af64b4
  由 Marin Jankovski 提交于 4月 04, 2014
```
Add One Line Upgrader Command

This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.
```
  a3af64b4
- S
  Merge branch 'update_update_guides' into 'master' · 0ecd7f79
  由 Sytse Sijbrandij 提交于 4月 04, 2014
```
Add to update guides satellites group permission.
```
  0ecd7f79
- R
  
  Add one line upgrade command. · 68436e96
  由 Remy van Elst 提交于 4月 04, 2014
  
  68436e96
- M
  
  Add to update guides satellites group permission. · 04324908
  由 Marin Jankovski 提交于 4月 04, 2014
  
  04324908
- D
  
  Reduce the number of times people send emails or file issues out of the blue. · 6205b068
  由 dosire 提交于 4月 04, 2014
  
  6205b068
- D
  Merge branch 'improve-mr-services' into 'master' · 49a51599
  由 Dmitriy Zaporozhets 提交于 4月 03, 2014
```
Improve MR services
```
  49a51599
03 4月, 2014 2 次提交
- D
  Add note when MR assignee changes. Add more tests to MR services · 860f159d
  由 Dmitriy Zaporozhets 提交于 4月 03, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  860f159d
- M
  
  Fix user_project observer test. · eca269f7
  由 Marin Jankovski 提交于 4月 03, 2014
  
  eca269f7