Commits · cf77b2b96d2603e528ffad635b23bfb144cc5746 · nexedi / gitlab-ce · GitLab

30 Dec, 2013 2 commits
- Merge branch '6-4-3-ce' of /home/git/repositories/gitlab/gitlab-ee · cf77b2b9
  Dmitriy Zaporozhets authored Dec 30, 2013
  
  cf77b2b9
- Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-3-ce · 4c3192b1
  Dmitriy Zaporozhets authored Dec 30, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
```
  4c3192b1
23 Dec, 2013 15 commits
- Version to 6.4.3 · 42131d01
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  42131d01
- don't use unicorn worker killer if PhusionPassenger is defined · 84093385
  James Newton authored Dec 20, 2013
  
  84093385
- Merge branch '6-4-from-ce' of /home/git/repositories/gitlab/gitlab-ee · facc3891
  Dmitriy Zaporozhets authored Dec 23, 2013
  
  facc3891
- Add 6.4.1 and 6.4.2 CHANGELOG · 221af222
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  221af222
- Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce · 71b12025
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	lib/gitlab/upgrader.rb
```
  71b12025
- Version to 6.4.2 · 214a013b
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  214a013b
- Fix upgrader · 58472180
  Dmitriy Zaporozhets authored Dec 23, 2013
```
It created branch based on current branch which is an old version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  58472180
- Merge branch '6-4-from-ce' of dev.gitlab.org:gitlab/gitlab-ee into 6-4-from-ce · 8478f911
  Dmitriy Zaporozhets authored Dec 23, 2013
  
  8478f911
- Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce · d663e895
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
```
  d663e895
- Version to 6.4.1 · 6bc3b5df
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6bc3b5df
- Fix 500 error when rename repository · cc51931d
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc51931d
- Fix project transfer feature · 5582ae14
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5582ae14
- Update db schema · 3eba8d74
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3eba8d74
- Fix upgrader · 581f4663
  Dmitriy Zaporozhets authored Dec 23, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  581f4663
- 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 8 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