Commits · 22fb992db75171d2777f16bbf9b5da69eec7bb3e · nexedi / gitlab-ce

17 Jul, 2014 11 commits
- Merge branch 'release-candidate' into 'master' · 22fb992d
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Release candidate

See merge request !129
```
  22fb992d
- 7.1 CE to EE · d76700a8
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d76700a8
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate · a2e5ec7c
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
```
  a2e5ec7c
- Merge branch 'release-candidate' into 'master' · b634d280
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977
```
  b634d280
- Update guide from 6.0 to 7.1 · 2bd20b7c
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2bd20b7c
- Version to rc1 · 4db9c6e0
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4db9c6e0
- Point installation manual to 7-1-stable · f59a721e
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f59a721e
- Update guide from 7.0 to 7.1 · 771f4dbc
  Dmitriy Zaporozhets authored Jul 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  771f4dbc
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · f10c189b
  Dmitriy Zaporozhets authored Jul 17, 2014
  
  f10c189b
- Merge branch 'doc/fix_update_doc_links' into 'master' · 2bccce2e
  Jeroen van Baarsen authored Jul 17, 2014
```
Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse
```
  2bccce2e
- Merge branch 'fix-typo' into 'master' · 90544305
  Jeroen van Baarsen authored Jul 17, 2014
```
Fix typos in CONTRIBUTING.md

This MR fixes two typos in [CONTRIBUTING.md](CONTRIBUTING.md).
```
  90544305
16 Jul, 2014 17 commits
- Merge pull request #7257 from cirosantilli/patch-4 · d5d6fc3d
  Jeroen van Baarsen authored Jul 16, 2014
```
Clariy squash comes after review.
```
  d5d6fc3d
- Ensure the readme answers the most important questions. · c3007888
  Sytse Sijbrandij authored Jul 16, 2014
  
  c3007888
- Merge branch 'ce-7-1' into 'master' · 28cab284
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Merge CE 7.1 into EE

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1438

See merge request !128
```
  28cab284
- Fix user params when edit from admin area · de582ab3
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de582ab3
- Fix user params when edit from admin area · 253ae9fe
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  253ae9fe
- Fix 404 for invited projects · cc193d70
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc193d70
- Fix admin edit user password · 4e9f7c21
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4e9f7c21
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 · b03b69e2
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
```
  b03b69e2
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · aa25c0ff
  Dmitriy Zaporozhets authored Jul 16, 2014
  
  aa25c0ff
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 2f78e6d0
  Dmitriy Zaporozhets authored Jul 16, 2014
  
  2f78e6d0
- Fix typo in CHANGELOG · cc5a5a03
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc5a5a03
- Merge pull request #7314 from axilleas/houndci_single_quotes · 150aadad
  Sytse Sijbrandij authored Jul 16, 2014
```
Make houndci prefer single quotes.
```
  150aadad
- Merge branch 'release-template' into 'master' · 13f5e360
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Release template

See merge request !972
```
  13f5e360
- Make houndci prefer single quotes. · e9a92381
  Achilleas Pipinellis authored Jul 16, 2014
  
  e9a92381
- Link to issues with # · c3a7d3e1
  Sytse Sijbrandij authored Jul 16, 2014
  
  c3a7d3e1
- Merge branch 'release-template' into 'master' · e3df8bf0
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Release template

Consider moving stuff like the packages from the 22nd to the 21st

See merge request !971
```
  e3df8bf0
- More stuff to CHANGELOG · 4f00d8fd
  Dmitriy Zaporozhets authored Jul 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f00d8fd
15 Jul, 2014 12 commits
- If MR commits are empty if does not mean compare failed · 9879c427
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9879c427
- Split work to the 17th and make issue template. · e043da13
  Sytse Sijbrandij authored Jul 15, 2014
  
  e043da13
- Default gix max size to 20mb · a6546f51
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a6546f51
- Merge branch 'fix-huge-mr' into 'master' · 2d6c4d2b
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Fix huge merge requests

* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs

Fixes #1424

See merge request !970
```
  2d6c4d2b
- Fix tests · 1d596526
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1d596526
- Refactor diff suppress logic and diff views · be5b6db8
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  be5b6db8
- Merge branch 'show_milestone_status_on_show_page' into 'master' · d1001e3d
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Show milestone status on group milestone show page

Closes #1430

See merge request !969
```
  d1001e3d
- Cleanup diff stats UI · 3dc347a3
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3dc347a3
- Refactor MR build process · 45623089
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  45623089
- Increase grit memory limit · 3780444c
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3780444c
- Merge branch 'images_in_help_pages' into 'master' · cd5b863f
  Dmitriy Zaporozhets authored Jul 15, 2014
```
Images in help pages

Fixes #121

See merge request !127
```
  cd5b863f
- Fix test for no milestone description. · b916bf43
  Marin Jankovski authored Jul 15, 2014
  
  b916bf43