Commits · 17bb700712f28c58564b0a2b1a2fcf375346d279 · nexedi / gitlab-ce

04 Apr, 2014 14 commits
- Only show diff it exists. · 17bb7007
  Marin Jankovski authored Apr 04, 2014
  
  17bb7007
- Merge branch 'deduplicate-help' into 'master' · 3d2c8185
  Dmitriy Zaporozhets authored Apr 04, 2014
```
Deduplicate help
```
  3d2c8185
- Merge branch 'gems-bump' into 'master' · 64341cca
  Dmitriy Zaporozhets authored Apr 04, 2014
```
Update gitlab_git and gitlab-grit gem versions
```
  64341cca
- Merge branch 'doc/ldap' into 'master' · 7611ce72
  Sytse Sijbrandij authored Apr 04, 2014
```
Explain LDAP activation for existing users
```
  7611ce72
- Explain how existing users can enable LDAP · bb9ec711
  Jacob Vosmaer authored Apr 04, 2014
  
  bb9ec711
- Merge branch 'small-feature-requests' into 'master' · a6bc4f0c
  Sytse Sijbrandij authored Apr 04, 2014
```
Small feature requests

/cc @dzaporozhets
```
  a6bc4f0c
- Ask for small feature requests. · e159a561
  dosire authored Apr 04, 2014
  
  e159a561
- Update gitlab_git and gitlab-grit gem versions · 11f864c9
  Dmitriy Zaporozhets authored Apr 04, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  11f864c9
- Merge branch 'no_email_on_notification_level_change' into 'master' · 14b68586
  Dmitriy Zaporozhets authored Apr 04, 2014
```
Don't send emails on notification level change
```
  14b68586
- Merge branch 'add-one-line-upgrader-command' into 'master' · a3af64b4
  Marin Jankovski authored Apr 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
- Merge branch 'update_update_guides' into 'master' · 0ecd7f79
  Sytse Sijbrandij authored Apr 04, 2014
```
Add to update guides satellites group permission.
```
  0ecd7f79
- Add one line upgrade command. · 68436e96
  Remy van Elst authored Apr 04, 2014
  
  68436e96
- Add to update guides satellites group permission. · 04324908
  Marin Jankovski authored Apr 04, 2014
  
  04324908
- Reduce the number of times people send emails or file issues out of the blue. · 6205b068
  dosire authored Apr 04, 2014
  
  6205b068
03 Apr, 2014 22 commits
- Merge branch 'improve-mr-services' into 'master' · 49a51599
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Improve MR services
```
  49a51599
- Add note when MR assignee changes. Add more tests to MR services · 860f159d
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  860f159d
- Fix user_project observer test. · eca269f7
  Marin Jankovski authored Apr 03, 2014
  
  eca269f7
- Mention protected branch force push · 8cc5e855
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8cc5e855
- Fix support for force_push · 53504928
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  53504928
- Merge pull request #6190 from... · 207f34b8
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion

protect protected branched to force updates
```
  207f34b8
- Merge branch 'specific-warning-for-version-managers' into 'master' · 6594ce1d
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Specific-warning-for-version-managers
```
  6594ce1d
- Only send email when project access level changes. · 0e7665e0
  Marin Jankovski authored Apr 03, 2014
  
  0e7665e0
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 1eec1f4f
  Dmitriy Zaporozhets authored Apr 03, 2014
  
  1eec1f4f
- Merge branch 'reduce-observers' into 'master' · a7ab029d
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Remove some observers
```
  a7ab029d
- More test fixes · 9b6224f9
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9b6224f9
- Fix tests that dont respect project-fork relation. pt2 · e1dd76d5
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e1dd76d5
- Fix tests that dont respect project-fork relation · c31b7031
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c31b7031
- Merge branch 'annotated-tag' into 'master' · 96f91c0f
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Annotated tag
```
  96f91c0f
- Merge pull request #6639 from yatish27/ConsistentJSFormat · 76c4421b
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Consistent format for class objects in javascript
```
  76c4421b
- Merge branch 'update-changelog' into 'master' · 9c6e5eab
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Update changelog
```
  9c6e5eab
- Update changelog in master. · fa27b633
  dosire authored Apr 03, 2014
  
  fa27b633
- Specify that the tag should be annotated. · 770747af
  dosire authored Apr 03, 2014
  
  770747af
- Merge branch 'modernizr_gem' into 'master' · ca1d31f8
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Remove Modernizr gem
```
  ca1d31f8
- Fix MR fork validation and services load · 9b598fa6
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9b598fa6
- Do not require modernizr. · 7ab46b96
  Marin Jankovski authored Apr 03, 2014
  
  7ab46b96
- Remove modernizr gem. · 14ac0746
  Marin Jankovski authored Apr 03, 2014
  
  14ac0746
02 Apr, 2014 4 commits
- Use MergeRequest services in API and controllers · 9ee697dd
  Dmitriy Zaporozhets authored Apr 02, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9ee697dd
- MergeRequest services for create, update, close and reopen · 3c867dfa
  Dmitriy Zaporozhets authored Apr 02, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3c867dfa
- Remove MergeRequest observer · 65cd9829
  Dmitriy Zaporozhets authored Apr 02, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  65cd9829
- Remove KeysObserver · 6ae25290
  Dmitriy Zaporozhets authored Apr 02, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ae25290