Commits · 5bba8218435490221be09ead74977ff60800bc68 · nexedi / gitlab-ce

24 Apr, 2014 3 commits
- Merge branch 'ce-6-8-1' into 'master' · 5bba8218
  Job van der Voort authored Apr 24, 2014
```
Put 6.8.1 into EE
```
  5bba8218
- Merge branch '6-8-stable' of dev.gitlab.org:gitlab/gitlabhq into ce-6-8-1 · 31e804f8
  Dmitriy Zaporozhets authored Apr 24, 2014
```
Conflicts:
	VERSION
```
  31e804f8
- Merge branch '6-8-ce-to-ee' into 'master' · c95cca9d
  Dmitriy Zaporozhets authored Apr 24, 2014
```
Upstream 6.8 CE to EE
```
  c95cca9d
23 Apr, 2014 2 commits
- Bump version to 6.8.1 · 31979907
  Jacob Vosmaer authored Apr 23, 2014
  
  31979907
- Bump the required gitlab-shell version to 1.9.3 · 15ac738c
  Jacob Vosmaer authored Apr 23, 2014
  
  15ac738c
22 Apr, 2014 17 commits
- Merge branch '6-8-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-8-stable · a0c3643f
  Job van der Voort authored Apr 22, 2014
  
  a0c3643f
- version 6.8.0 · 241132b6
  Job van der Voort authored Apr 22, 2014
  
  241132b6
- Merge branch 'master' of https://github.com/gitlabhq/gitlabhq · 6fd13ab0
  Dmitriy Zaporozhets authored Apr 22, 2014
  
  6fd13ab0
- Merge branch 'shell_version_install_doc' into 'master' · 07deb225
  Dmitriy Zaporozhets authored Apr 22, 2014
```
Update Shell version in the Install doc
```
  07deb225
- Merge branch 'shell_version_install_doc' into '6-8-stable' · c66adcea
  Dmitriy Zaporozhets authored Apr 22, 2014
```
Update Shell version in the Install doc
```
  c66adcea
- Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via-env-variable · 7e10d013
  Sytse Sijbrandij authored Apr 22, 2014
```
Allow to overwrite location of gitlab.yml config file.
```
  7e10d013
- Merge pull request #6783 from pkgr/allow-secret-token-env · 52a247da
  Sytse Sijbrandij authored Apr 22, 2014
```
Allow to specify secret token via SECRET_KEY_BASE environment variable.
```
  52a247da
- Merge branch 'detailed-monthly-release' into 'master' · 6d4e2776
  Sytse Sijbrandij authored Apr 22, 2014
```
Detailed monthly release

Fixes #1190
```
  6d4e2776
- remove redudant text in release doc · e79c915d
  Job van der Voort authored Apr 22, 2014
  
  e79c915d
- Update installation guide with new shell version. · 19438af8
  Marin Jankovski authored Apr 22, 2014
  
  19438af8
- add steps to monthly releases · 223070b3
  Job van der Voort authored Apr 22, 2014
  
  223070b3
- Update db schema · 55e46ad5
  Dmitriy Zaporozhets authored Apr 22, 2014
  
  55e46ad5
- Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee · c4e713a5
  Dmitriy Zaporozhets authored Apr 22, 2014
```
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
```
  c4e713a5
- Merge branch 'master' of https://github.com/gitlabhq/gitlabhq · 1b491c36
  Dmitriy Zaporozhets authored Apr 22, 2014
  
  1b491c36
- Merge pull request #6806 from robertd/fix-typo-in-docs · 3d3e3913
  Job van der Voort authored Apr 22, 2014
```
Fix minor typo in docs
```
  3d3e3913
- Merge branch '512mb' into 'master' · 814a4595
  Dmitriy Zaporozhets authored Apr 22, 2014
```
512mb

Most people only care about the 512mb option, we should mention that with one worked you don't get http pushes.
```
  814a4595
- Merge pull request #6808 from robertd/upgrade-docs-6.7-6.8 · 3e50d615
  Job van der Voort authored Apr 22, 2014
```
Update title and revert section of 6.7-to-6.8 docs
```
  3e50d615
21 Apr, 2014 2 commits
- Update title and revert section of 6.7-to-6.8 docs · e2fd2bf9
  robertd authored Apr 17, 2014
  
  e2fd2bf9
- Take into account active users. · 01799721
  dosire authored Apr 21, 2014
  
  01799721
18 Apr, 2014 6 commits
- Merge pull request #6821 from skv-headless/fix_type · 9b7dd8b4
  Sytse Sijbrandij authored Apr 18, 2014
```
fix installation.md typo
```
  9b7dd8b4
- fix installation.md type · bc732a89
  Evgeniy Sokovikov authored Apr 18, 2014
```
depency -> dependency
```
  bc732a89
- Merge branch 'workflow_documentation' into 'master' · 2bfd95d8
  Sytse Sijbrandij authored Apr 18, 2014
```
Workflow documentation
```
  2bfd95d8
- Remove help document title · f0f0ac63
  Jacob Vosmaer authored Apr 18, 2014
```
Help pages on doc.gitlab.com/ce are missing titles. This needs to be
solved globally.
```
  f0f0ac63
- Bring back 'Authorization for Merge Requests' · eadcd278
  Jacob Vosmaer authored Apr 18, 2014
```
This text was deleted in 564c37d9.
```
  eadcd278
- Link to the workflow index · b9e040f8
  Jacob Vosmaer authored Apr 18, 2014
  
  b9e040f8
17 Apr, 2014 10 commits
- Merge branch 'update-monthly-release-doc' into 'master' · ad61a613
  Dmitriy Zaporozhets authored Apr 17, 2014
```
Update monthly release doc

/cc @sytse @jacobvosmaer @marin
```
  ad61a613
- Merge branch 'official-location' into 'master' · 43ac196d
  Dmitriy Zaporozhets authored Apr 17, 2014
```
Official location

I got two today:
https://twitter.com/wonderb0lt/status/456545094644936705
https://twitter.com/madpew/status/456758525398884352
```
  43ac196d
- Fix minor typo in docs · b3e5b12e
  robertd authored Apr 17, 2014
  
  b3e5b12e
- add dependency check to montly release doc and tweet instructions · f8112381
  Job van der Voort authored Apr 17, 2014
  
  f8112381
- Prevent questions about the canonical source. · bd183bfb
  dosire authored Apr 17, 2014
  
  bd183bfb
- Merge branch 'rc1-updates' into 'master' · b14c475a
  Dmitriy Zaporozhets authored Apr 17, 2014
```
Rc1 updates

#1178

Please check it well 😃

If this gets merged, the annotated version tag 6.8.0.rc1 will point to https://dev.gitlab.org/gitlab/gitlabhq/commit/e6b668ab0169f981a5c4162cd8625daf02e6f5a8

/cc @sytse @jacobvosmaer @marin
```
  b14c475a
- bump versions in update guide · f931195d
  Job van der Voort authored Apr 17, 2014
  
  f931195d
- add 67-68 update guide · c2ad3063
  Job van der Voort authored Apr 17, 2014
  
  c2ad3063
- update VERSION to 6.8.0.rc1 · e6b668ab
  Job van der Voort authored Apr 17, 2014
  
  e6b668ab
- update version in installation doc · 00b576e6
  Job van der Voort authored Apr 17, 2014
  
  00b576e6