Commits · 430ceaa912bd0e41571829584568bd8b5992b665 · nexedi / gitlab-ce

28 Mar, 2014 5 commits
- Merge branch 'bug/ldap_dn_matches_filter' into 'master' · 430ceaa9
  Jacob Vosmaer authored Mar 28, 2014
```
Handle LDAP errors in Adapter#dn_matches_filter?
```
  430ceaa9
- Add changelog entry for dn_matches_filter? bug · 4e9d2808
  Jacob Vosmaer authored Mar 28, 2014
  
  4e9d2808
- Check for errors in Adapter#dn_matches_filter? · 2bfa02bb
  Jacob Vosmaer authored Mar 28, 2014
  
  2bfa02bb
- Add test for LDAP::Adapter#dn_matches_filter? · 401cac62
  Jacob Vosmaer authored Mar 28, 2014
  
  401cac62
- Subscribers should use subscribers@gitlab.com · ec73107d
  Jacob Vosmaer authored Mar 28, 2014
  
  ec73107d
26 Mar, 2014 5 commits
- Add changelog entry for admin group edit fix · 93e064c9
  Jacob Vosmaer authored Mar 26, 2014
  
  93e064c9
- Merge branch 'documentation/git_hooks' into 'master' · 197e793c
  Sytse Sijbrandij authored Mar 26, 2014
```
More documentation for git hooks
```
  197e793c
- Add a link to the Ruby Regexp documentation · 7017474b
  Jacob Vosmaer authored Mar 26, 2014
  
  7017474b
- Git tags can still be deleted through the UI · 403c10b2
  Jacob Vosmaer authored Mar 26, 2014
  
  403c10b2
- Skip git hooks if oldrev or newrev is nil · 713815df
  Dmitriy Zaporozhets authored Mar 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  713815df
25 Mar, 2014 2 commits
- Merge branch '6-7-2-ce' into 'master' · 67e942cc
  Dmitriy Zaporozhets authored Mar 25, 2014
```
CE 6.7.2 changes
```
  67e942cc
- Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce · 3a293fa9
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
```
  3a293fa9
24 Mar, 2014 2 commits
- Merge branch 'upgrader-test' into 'master' · ffaeca90
  Dmitriy Zaporozhets authored Mar 24, 2014
```
Upgrader Test

/cc @jacobvosmaer @job @marin
```
  ffaeca90
- Add upgrader test. · c9fd0bd4
  dosire authored Mar 24, 2014
  
  c9fd0bd4
21 Mar, 2014 26 commits
- Version 6.7.2 · dbbf4ea2
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dbbf4ea2
- Fix upgrader · a261c5fc
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a261c5fc
- Version 6.7.1 · ba0d8842
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ba0d8842
- Fix gitlab-ci integration · b8d83d25
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8d83d25
- Merge branch 'update-install-doc-branch' into '6-7-stable' · 919bc979
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Update Install Doc Branch

/cc @marin
```
  919bc979
- Should be 6-7. · a9863ed0
  dosire authored Mar 21, 2014
  
  a9863ed0
- Version 6.7.0 · 80236d6c
  Marin Jankovski authored Mar 21, 2014
  
  80236d6c
- Merge branch 'what-is-a-bug' into 'master' · a13190bc
  Sytse Sijbrandij authored Mar 21, 2014
```
What Is A Bug
```
  a13190bc
- Ensure I can link to this line. · d0361241
  dosire authored Mar 21, 2014
  
  d0361241
- Features people are missing are not bugs. · af3aaadd
  dosire authored Mar 21, 2014
  
  af3aaadd
- Merge branch 'update_guid_shell_version' into 'master' · b1a079f6
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Update Gitlab Shell Version in documentation
```
  b1a079f6
- Update gitlab-shell version in documentation. · 020b6816
  Marin Jankovski authored Mar 21, 2014
  
  020b6816
- Fix http clone for public project · c55d2345
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c55d2345
- Merge branch 'fix-grack-auth' into 'master' · 1c42cc35
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Fix http clone for public project
```
  1c42cc35
- Merge branch 'update_upgrade_document' into 'master' · d3dcd7c3
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Update Upgrade from 6.6 ce to ee document

Use correct assets commands.
```
  d3dcd7c3
- Fix http clone for public project · 7dd18a3e
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7dd18a3e
- Update ce to ee guide to use correct assets commands. · 758149bb
  Marin Jankovski authored Mar 21, 2014
  
  758149bb
- Merge branch 'update_upgrade_document' into 'master' · 8ae59330
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Update Upgrade Document for 6.7

Use the latest version of gitlab-shell which is 1.9.0
```
  8ae59330
- Use the latest tag, 1.9.1 for gitlab-shell. · 895c9132
  Marin Jankovski authored Mar 21, 2014
  
  895c9132
- Checkout gitlab-shell v 1.9.0 · 6d9dccbe
  Marin Jankovski authored Mar 21, 2014
  
  6d9dccbe
- Merge branch 'ce-6-7-rc' into 'master' · 43fa2510
  Dmitriy Zaporozhets authored Mar 21, 2014
```
GitLab CE 6.7.0.rc1
```
  43fa2510
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc · 3fa2dd11
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
```
  3fa2dd11
- Merge branch '76-admin-group-edit' into 'master' · faa08fe6
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Fix group edit in admin area

Fixes #76

Strangly, the buttons were pushed out of the form. By including them in the fieldset of the second part of form, the layout doesn't change, but the buttons are nested within the form and are functional again.
```
  faa08fe6
- Merge branch 'wording-of-pre-receive-hooks' into 'master' · e106640e
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Wording Of Pre Receive Hooks
```
  e106640e
- Update changelog with git hooks · 207071c6
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  207071c6
- Improve the wording. · bdc0ea45
  dosire authored Mar 21, 2014
  
  bdc0ea45