Commits · 9436c506d458842dc4b90caf6de08bbf3dfe8106 · nexedi / gitlab-ce

11 Apr, 2014 1 commit
- Merge branch 'upstream-ce-6-8' into 'master' · 9436c506
  Dmitriy Zaporozhets authored Apr 11, 2014
```
Upstream CE 6.8
```
  9436c506
10 Apr, 2014 12 commits
- Merge branch 'ee-6.7.3-pkgs' into 'master' · 4f5ec3a2
  Jacob Vosmaer authored Apr 10, 2014
```
Ee 6.7.3 pkgs

I also updated the formatting a bit in the document.
```
  4f5ec3a2
- make archive easier to navigate · 875556fd
  Job van der Voort authored Apr 10, 2014
  
  875556fd
- add 6.7.3-ee packages · a83b40b3
  Job van der Voort authored Apr 10, 2014
  
  a83b40b3
- Remove application.js · 89eabd30
  Dmitriy Zaporozhets authored Apr 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  89eabd30
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 · fae2e540
  Dmitriy Zaporozhets authored Apr 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
```
  fae2e540
- Fix avatars in the network graph for relative-url setups. · 5b123dbf
  Thomas Moschny authored Apr 07, 2014
  
  5b123dbf
- Merge branch 'no-link-to-centos-guide' into 'master' · 5830d672
  Dmitriy Zaporozhets authored Apr 10, 2014
```
No link to centos guide
```
  5830d672
- Merge branch 'email_update_test' into 'master' · 6d761461
  Dmitriy Zaporozhets authored Apr 10, 2014
```
Email update test
```
  6d761461
- Remove the vmi's. · 355b1202
  dosire authored Apr 10, 2014
  
  355b1202
- No capital letter for recommended. · 549758b3
  dosire authored Apr 10, 2014
  
  549758b3
- Merge branch 'ensure_default_fields' into 'master' · 89ecb191
  Dmitriy Zaporozhets authored Apr 10, 2014
```
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
```
  89ecb191
- Steer people to the packages since people encounter less errors installing those. · 670e0298
  dosire authored Apr 10, 2014
  
  670e0298
09 Apr, 2014 26 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 03472b4f
  Dmitriy Zaporozhets authored Apr 09, 2014
  
  03472b4f
- Fix note body align · 77934172
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  77934172
- Merge pull request #6729 from hiroponz/fix-seed-fu · 5c9127ea
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Fix rake db:seed_fu ENV=development
```
  5c9127ea
- Reduce note header padding · fd8a165d
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd8a165d
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 67b07f96
  Dmitriy Zaporozhets authored Apr 09, 2014
  
  67b07f96
- Modify project default values · 9f6a8ff4
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9f6a8ff4
- Merge branch 'ensure_satellite_exists' into 'master' · f23dcac9
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Ensure satellite exists instead of raising an error
```
  f23dcac9
- Merge branch 'clean_old_archives' into 'master' · 4e9add7c
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Clean old archives from repository downloads directory
```
  4e9add7c
- Merge branch 'wiki-refactoring' into 'master' · fae6eb63
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Wiki refactoring

Better names for variables and classes
```
  fae6eb63
- Dont raise an error with satellites, make sure it exists. · 63ba9835
  Marin Jankovski authored Apr 09, 2014
  
  63ba9835
- Add to clean archives to changelog. · 944ebb8e
  Marin Jankovski authored Apr 09, 2014
  
  944ebb8e
- Remove archives older than 2 hours. · b2959c41
  Marin Jankovski authored Apr 09, 2014
  
  b2959c41
- Fix default value for project model · 466f0fb7
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  466f0fb7
- Re-annotate models · 36f861f1
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  36f861f1
- Use ProjectWiki instead of GollumWiki in code · 1bd28994
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1bd28994
- Refactor wiki model · 26ec74c4
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  26ec74c4
- Rename wiki variables · b27c42be
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b27c42be
- Add values to default fields to prevent 500 error when migrate from MySQL to Postgres · c5cdd078
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c5cdd078
- Test update_email method. · 0cf7f2f8
  Marin Jankovski authored Apr 09, 2014
  
  0cf7f2f8
- Merge branch 'issue_on_empty_repo' into 'master' · 71678f08
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Fix for error 500 on create issue for empty repo
```
  71678f08
- Typo fix in process.md · f5b7899c
  Jeroen van Baarsen authored Apr 09, 2014
  
  f5b7899c
- Do not require modernizr. · cf616a84
  Marin Jankovski authored Apr 03, 2014
```
Conflicts:
	app/assets/javascripts/main.js.coffee
```
  cf616a84
- Remove modernizr gem. · ac2fd399
  Marin Jankovski authored Apr 03, 2014
  
  ac2fd399
- Merge branch 'installation-order' into 'master' · e099d662
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Installation order
```
  e099d662
- People forget to compile their assets, start after doing that. · 12c49dd9
  dosire authored Apr 09, 2014
  
  12c49dd9
- Fix rake db:seed_fu ENV=development · 0ed2f8de
  Hiroyuki Sato authored Apr 09, 2014
```
This problem was reported on https://gitlab.com/gitlab-org/cookbook-gitlab/issues/46
```
  0ed2f8de
08 Apr, 2014 1 commit

Merge branch 'why-all-the-dev' into 'master' · 797813b9

Sytse Sijbrandij authored Apr 08, 2014

Why all the dev packages

Document the need for dev packages since Multiple people asked about it.

/cc @marc @jacobvosmaer

797813b9