Commits · f23ffeece741caaf5e50002c4dca23a914480331 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

21 Dec, 2013 2 commits
- Merge branch '6-5-dev' · f23ffeec
  Dmitriy Zaporozhets authored Dec 21, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
```
  f23ffeec
- Version to 6.5.0.pre · 68118b54
  Dmitriy Zaporozhets authored Dec 21, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  68118b54
20 Dec, 2013 9 commits
- Merge pull request #5888 from jameswritescode/passenger_fix · 59c5a42e
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Don't use unicorn worker killer if using Phusion Passenger
```
  59c5a42e
- don't use unicorn worker killer if PhusionPassenger is defined · 756258ab
  James Newton authored Dec 20, 2013
  
  756258ab
- 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
- Use relative dates with tooltips fopr Issue#show and MR#show · a8496763
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a8496763
- 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
- Fix tests · e64c3b2b
  Dmitriy Zaporozhets authored Dec 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e64c3b2b
19 Dec, 2013 19 commits
- Fix broadcast message factory · 9728ae85
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9728ae85
- Consistent place for state-label across issues, mr, milestones · d1aff25c
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d1aff25c
- UI: use different padding in labels for Issues#show and Issues#index · 3cdb8f26
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3cdb8f26
- UI: allign milestone to right for issue, mr show page · 63d5fcc8
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  63d5fcc8
- Add validations to BroadcastMessage color and font · d1e84958
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d1e84958
- Move broadcast colors CHANGELOG to 6.5 · e78c51f7
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e78c51f7
- Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev · aef944ba
  Dmitriy Zaporozhets authored Dec 19, 2013
  
  aef944ba
- Added milestone_options and assigne_options helpers · 3958330e
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3958330e
- remove unecessary bold text on Issue#show page · 5c68f4f4
  Dmitriy Zaporozhets authored Dec 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5c68f4f4
- UI improvements to issue show page · 1616dfdc
  Dmitriy Zaporozhets authored Dec 19, 2013
```
* labels moved below the issue
* removed margin in "created by..." area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1616dfdc
- Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev · 5405f19b
  Dmitriy Zaporozhets authored Dec 19, 2013
  
  5405f19b
- 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 'unicorn_worker_killer' of /home/git/repositories/gitlab/gitlabhq · 8fb9dccd
  Dmitriy Zaporozhets authored Dec 19, 2013
  
  8fb9dccd
18 Dec, 2013 10 commits
- Customization and previewing of broadcast messages · 0760ba3e
  Andrew Tomaka authored Dec 09, 2013
  
  0760ba3e
- 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
- 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
- Change archive icon and clone panel styling. · e1fa9abd
  Jason Hollingsworth authored Dec 17, 2013
  
  e1fa9abd
- 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