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

13 3月, 2014 2 次提交
- D
  Add retry feature to project import · b47646ef
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b47646ef
- D
  Project import and retry import scaffold · 37db76a3
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  37db76a3
12 3月, 2014 6 次提交
- D
  Add project import state machine · 1436433c
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1436433c
- D
  Move project creation to service · 7f50c7f6
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7f50c7f6
- D
  Add Project#import_status field · e603da73
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e603da73
- D
  Improve import notice · 42f25e75
  由 Dmitriy Zaporozhets 提交于 3月 12, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  42f25e75
- D
  Show import notice in callout block · dff9221c
  由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dff9221c
- D
  Better explanation for import url · a6eb28ab
  由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a6eb28ab
11 3月, 2014 19 次提交

Merge branch 'fix/social-account-block' into 'master' · a599d812

由 Dmitriy Zaporozhets 提交于 3月 11, 2014

Fix Social Account Block

If you have omniauth enabled, but don't have one of the "Social" providers enabled (GitHub, Twitter, Google), the "Social Accounts" sections shows up, but without icons. This occurred when I was testing Shibboleth. This fixes the issues by checking if there are any `enabled_oauth_providers` rather than if just `Gitlab.config.omniauth.enabled`. Not quite sure how to implement a test for this, but it works :).

a599d812

D
Refactor js behaviours helpers · 7157f79c
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7157f79c
D
SHow group name in access granted email · 9f405068
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
9f405068
D
More entries to CHANGELOG · 0c3aa2e8
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
0c3aa2e8

Merge branch 'simplify-emails-content' into 'master' · c4f9dff4

由 Dmitriy Zaporozhets 提交于 3月 11, 2014

Streamline the content of notification emails

In notification emails, the actual content of the email is often buried under several blocks of chrome — and may even be truncated or completely missing. Ideally, the notification emails would be like *real emails*: a short message of meaningful text, sent from the author of the change that triggered the notification.

This MR includes the following changes to notification emails:

* Remove much of the chrome (e.g. the "GitLab" header)
* Emphasize the content (no more small, grayed-out content)
* Add missing informations to the emails (issue description in "new issue" email, file name in "diff comment" email)
* Add a consistent "View in GitLab" link in the footer
* The assignee is displayed only if someone is assigned
* Fix a rendering bug when viewing emails with [Zimbra](http://www.zimbra.com/)

We use these patches at [Capitaine Train](http://www.capitainetrain.com), and it has been a surprisingly big productivity boost for us.

![Before and after](http://f.cl.ly/items/3n0P2c2v1P0y011c0D3e/Before%20and%20After.png)

c4f9dff4

D
Use username instead of wierd email for first login · dcda7516
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
dcda7516
D

Merge branch 'master' of github.com:gitlabhq/gitlabhq · f16de8ac
由 Dmitriy Zaporozhets 提交于 3月 11, 2014

f16de8ac
D
Merge branch 'ldap-code' into 'master' · 767f7d9a
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
LDAP code from EE
```
767f7d9a
D
Add User#requires_ldap_check? method · c6d39a14
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
c6d39a14
D
Merge pull request #6478 from infoMantisGmbH/master · ae68a66a
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Allow underscore as the first char for project names.
```
ae68a66a
D
Merge pull request #6503 from mjdetullio/fix/group-admin · 4b946690
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
[6.6] Fixes a bug with group member administration
```
4b946690
D
Add User#last_credential_check_at · cf890b22
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
cf890b22
D
Remove non-exist method from ldap security check · e57e1e04
由 Dmitriy Zaporozhets 提交于 3月 11, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e57e1e04
M
Fixes a bug with group member administration · 5d6d795d
由 Matt DeTullio 提交于 3月 09, 2014
```
Group owners were not able to remove any users from their group if they were the only owner.
```
5d6d795d
D
Merge branch 'catch_missing_command' into 'master' · 92a92846
由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Catch missing commands in Rake tasks
```
92a92846
D
Fix ldap_user_auth_spec · 3e864036
由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3e864036
J

Catch missing commands in rake tasks with '' · ad71eca8
由 Jacob Vosmaer 提交于 3月 10, 2014

ad71eca8
D
Merge branch 'remove-dot-org' into 'master' · d55ee139
由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Remove Dot Org
```
d55ee139
D

Update references to gitlab dot com. · 509c4516
由 dosire 提交于 3月 10, 2014

509c4516

10 3月, 2014 13 次提交
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 0aa389b4
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
  
  0aa389b4
- D
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · ea432f60
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
  
  ea432f60
- D
  Merge pull request #6480 from jvanbaarsen/add-envrc-to-ignore · a7df646e
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Add envrc to git-ignore
```
  a7df646e
- D
  Merge pull request #6492 from tsigo/gitlab-shell-custom-path · dca8f6d4
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
```
  dca8f6d4
- D
  Merge pull request #6500 from tsigo/natural-tag-sorting · d33d550e
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Natural version sorting
```
  d33d550e
- D
  Merge branch 'add-enterprise-linux' into 'master' · 322a8f1d
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Add Enterprise Linux
```
  322a8f1d
- D
  Merge branch 'increase-nginx-push-size' into 'master' · 5ae9de74
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Increase Nginx Push Size
```
  5ae9de74
- D
  Add ldap check in application_controller and internal api · b1ff8e31
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b1ff8e31
- D
  Remove copyright · 0fdab6a7
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0fdab6a7
- D
  Port LDAP code from EE · daa7f077
  由 Dmitriy Zaporozhets 提交于 3月 10, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  daa7f077
- J
  Merge pull request #6494 from tsigo/fix-redis-version-check · 0142aa5a
  由 Jacob Vosmaer 提交于 3月 10, 2014
```
Fix now-invalid invocation of `run_and_match` in gitlab:check
```
  0142aa5a
- D
  
  Update changelog. · b5264c24
  由 dosire 提交于 3月 10, 2014
  
  b5264c24
- D
  
  Some people are getting the error 'The remote end hung up unexpectedly' due to large chuncks. · 6bf5215b
  由 dosire 提交于 3月 10, 2014
  
  6bf5215b