Commits · 09ebd837c94ff469743f88d3899efae4b9233962 · nexedi / gitlab-ce

12 May, 2014 1 commit
- Merge branch 'update_rails_version' into 'master' · 09ebd837
  Dmitriy Zaporozhets authored May 12, 2014
```
Update rails version to 4.0.5
```
  09ebd837
09 May, 2014 2 commits
- Merge branch 'ldap_scoping' into 'master' · 9490abf4
  Jacob Vosmaer authored May 09, 2014
```
Restrict LDAP scope in dn_matches_filter
```
  9490abf4
- Add scope to dn filter. · d9c0ecdc
  Marin Jankovski authored May 09, 2014
  
  d9c0ecdc
08 May, 2014 4 commits
- Add the 6.8 CE to EE update guide · f4f99a93
  Jacob Vosmaer authored May 08, 2014
  
  f4f99a93
- Add scoping to ldap lookup. · 47c0b4b1
  Marin Jankovski authored May 08, 2014
  
  47c0b4b1
- Update sass-rails with newer version of rails. · 198bd6d5
  Marin Jankovski authored May 08, 2014
  
  198bd6d5
- Update rails to 4.0.5. · ce3fe87d
  Marin Jankovski authored May 08, 2014
  
  ce3fe87d
07 May, 2014 2 commits
- Merge branch 'jira_references' into 'master' · fdfcf01a
  Dmitriy Zaporozhets authored May 07, 2014
```
Reference JIRA tickets without hash
```
  fdfcf01a
- Better name for config variable. · 32eb647c
  Marin Jankovski authored May 07, 2014
  
  32eb647c
06 May, 2014 1 commit
- Add support for Jira ticket mentions in format JIRA-123. · 7bc054ec
  Marin Jankovski authored May 06, 2014
  
  7bc054ec
30 Apr, 2014 3 commits
- Merge branch 'package_info' into 'master' · 8909f564
  Jacob Vosmaer authored Apr 30, 2014
```
Correct package info
```
  8909f564
- Fix link text for 6.8.0-ee packages · d54800fd
  Jacob Vosmaer authored Apr 30, 2014
  
  d54800fd
- Update information about supported features · c35501ca
  Jacob Vosmaer authored Apr 30, 2014
  
  c35501ca
28 Apr, 2014 2 commits
- Merge branch '68ee-pkgs' into 'master' · 7b209157
  Job van der Voort authored Apr 28, 2014
```
Omnibus packages for 6.8.0-ee
```
  7b209157
- new packages for 6.8.0-ee · 24f18044
  Job van der Voort authored Apr 28, 2014
  
  24f18044
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 1 commit
- Merge pull request #6821 from skv-headless/fix_type · 9b7dd8b4
  Sytse Sijbrandij authored Apr 18, 2014
```
fix installation.md typo
```
  9b7dd8b4