Commits · 1f43fa20d3ee854929e6325efd7c73e4eca48131 · nexedi / gitlab-ce

23 Dec, 2013 1 commit

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce · 1f43fa20

Dmitriy Zaporozhets authored Dec 23, 2013

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md

1f43fa20

20 Dec, 2013 5 commits
- Version 6.4.0 · 0e4a8e23
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0e4a8e23
- Update guide for 6.3 to 6.4 · 1dab27ee
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1dab27ee
- Point ot 6-4-stable · be3e1ccb
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  be3e1ccb
- Merge branch 'bug/mr_iids_duplicate' of /home/git/repositories/gitlab/gitlabhq · 6d3bb508
  Dmitriy Zaporozhets authored Dec 20, 2013
  
  6d3bb508
- Dont allow change of MR target or source projects after it was created · 1231a367
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1231a367
19 Dec, 2013 10 commits
- Merge pull request #5865 from skv-headless/master · 8bcb2ff2
  Dmitriy Zaporozhets authored Dec 19, 2013
```
pluck user_ids during team import
```
  8bcb2ff2
- Merge pull request #5881 from gendoc/master · 33feaa04
  Dmitriy Zaporozhets authored Dec 19, 2013
```
 More issues and merge request events support in Project web hooks
```
  33feaa04
- More visible title for Issues, MR etc · dc4b7cb4
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dc4b7cb4
- Updated help page for Project web hooks · 392d79db
  Humberto Pereira authored Dec 19, 2013
  
  392d79db
- Added hook execution to reopened e updated merge requests · d429835a
  Humberto Pereira authored Dec 19, 2013
  
  d429835a
- Added hook execution to reopened e updated issues · 1e8add32
  Humberto Pereira authored Dec 19, 2013
  
  1e8add32
- Show repo size for project show page in admin area · 8c670b66
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8c670b66
- Merge branch 'ldap_group_explanation' of /home/git/repositories/gitlab/gitlab-ee · 20fc9711
  Jacob Vosmaer authored Dec 19, 2013
  
  20fc9711
- Improve wording of LDAP sync explanation · 2f53c2d8
  Jacob Vosmaer authored Dec 19, 2013
  
  2f53c2d8
- Merge branch 'unicorn_worker_killer' of /home/git/repositories/gitlab/gitlabhq · 8fb9dccd
  Dmitriy Zaporozhets authored Dec 19, 2013
  
  8fb9dccd
18 Dec, 2013 23 commits
- Merge pull request #5867 from jhollingsworth/feature/styling-changes · 566b4962
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Change archive icon and clone panel styling.
```
  566b4962
- Validate project creator only on create · 35c4351e
  Dmitriy Zaporozhets authored Dec 18, 2013
```
This fixes bug when creator was removed and you cant edit project
because validation requires creator.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  35c4351e
- Use a block for the unicorn gems · 5e93494d
  Jacob Vosmaer authored Dec 18, 2013
  
  5e93494d
- Add unicorn-worker-killer with memory check · d27224ce
  Jacob Vosmaer authored Dec 18, 2013
```
Conflicts:
	Gemfile.lock
```
  d27224ce
- Fix grammar in help text · d19f5bd7
  Jacob Vosmaer authored Dec 18, 2013
  
  d19f5bd7
- 6.4 in beta now · 4db2e97b
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4db2e97b
- Merge branch 'irc-official' of /home/git/repositories/gitlab/gitlabhq · bd94cae8
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  bd94cae8
- Improve UI for Group ldap settings page · 4128f995
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4128f995
- Change archive icon and clone panel styling. · e1fa9abd
  Jason Hollingsworth authored Dec 17, 2013
  
  e1fa9abd
- Add unstyled explanation for LDAP group settings · 60797589
  Jacob Vosmaer authored Dec 18, 2013
  
  60797589
- Set font-weight:500 for row titles · 5e21976d
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e21976d
- Rename Services to Project services · 078b3f58
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  078b3f58
- Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq · 3b0acc9e
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  3b0acc9e
- Make comment preview button white · 4efaa51b
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4efaa51b
- Improve commits page UI · 1f41e1bc
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1f41e1bc
- move arhoved label from project title to sidebar · 5cb85258
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5cb85258
- Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url · 79248f4c
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Update default public pull url.
```
  79248f4c
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · dad576a7
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  dad576a7
- Merge branch 'feature/email_on_push_service' of /home/git/repositories/gitlab/gitlabhq · afd747d4
  Dmitriy Zaporozhets authored Dec 18, 2013
  
  afd747d4
- Merge pull request #5868 from beautyfree/patch-1 · bb0a47d4
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Duplicate opened scope for issue
```
  bb0a47d4
- Merge pull request #5869 from Spone/patch-1 · bea6eba8
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Tiny wording fix
```
  bea6eba8
- Move EmailOnPush logic to async worker · 6ac73f45
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ac73f45
- Email on push mailer spec · fc3878c0
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc3878c0
17 Dec, 2013 1 commit

tiny wording fix · ff0d8a18

Hans Lemuet authored Dec 18, 2013

GitLab users can can see this snippet -> GitLab users can see this snippet

ff0d8a18