Commits · e106640ea96c52099bc99f52c1f42ca2283a9a93 · nexedi / gitlab-ce

21 Mar, 2014 5 commits
- 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
- Merge branch 'git-hooks' into 'master' · d4957ee7
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Git Hooks
```
  d4957ee7
- Merge branch 'recursive_ldap_groups' into 'master' · abd6d821
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Recursive LDAP groups (ActiveDirectory only)
```
  abd6d821
20 Mar, 2014 12 commits
- Merge branch '6-6-ce-to-ee-update-guide' into 'master' · f716b2f5
  Jacob Vosmaer authored Mar 20, 2014
```
6 6 Ce To Ee Update Guide

6.6-CE to EE wasn't yet in the repository, so seemed like a good idea to add it.

Other than the branch, there are no changes.

/cc @jacobvosmaer
```
  f716b2f5
- Proper page title · 76155b17
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  76155b17
- Implement 2 git hooks: tagf removal and commit message · b8dc5d2c
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8dc5d2c
- Add an API reference for AD recursive LDAP lookup · 8722d6bd
  Jacob Vosmaer authored Mar 20, 2014
  
  8722d6bd
- GitHook model specs · f034e6f3
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f034e6f3
- GitHook model · f6c20b7b
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6c20b7b
- GitHooks scaffold · 8a936997
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8a936997
- Create git_hooks db table · 8d2755a2
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8d2755a2
- Improve grack auth · 45018850
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  45018850
- Merge branch 'git-refactoring' into 'master' · b12dcaf6
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Git Refactoring

Pull/Push refactoring. Must be ported to CE too.

Requires https://dev.gitlab.org/gitlab/gitlab-shell/merge_requests/26
```
  b12dcaf6
- Add support for nested Active Directory groups · ab37a095
  Jacob Vosmaer authored Mar 20, 2014
  
  ab37a095
- Reuse LDAP adapter in Group instances · cc768fdd
  Jacob Vosmaer authored Mar 20, 2014
  
  cc768fdd
19 Mar, 2014 5 commits
- Use 2 workers in development · 34969318
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  34969318
- push via http now served via /allowed API · 32268d8d
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32268d8d
- Use GitAccess in internal api · 7b59e2e2
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7b59e2e2
- Add Gitlab::GitAccess class to resolve auth issues during pull/push · b4bef5e6
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b4bef5e6
- add 6.6-ce-to-ee guide · a8adad9c
  Job van der Voort authored Mar 19, 2014
  
  a8adad9c
18 Mar, 2014 8 commits
- Merge branch 'show-shared-projects' into 'master' · b040f5da
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Show shared projects in Group#show page of admin area
```
  b040f5da
- Add tests · 822be2c7
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  822be2c7
- Show shared projects on Group#show in admin area · 334313a7
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  334313a7
- Merge branch 'code-from-ce-6-7' into 'master' · 44b3404e
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Code from CE 6.7

Fixes #75
```
  44b3404e
- Update db schema · 896159ca
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  896159ca
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 · e502d785
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
```
  e502d785
- Merge branch 'ldap_connection_reuse' into 'master' · 6fd29312
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Ldap Connection Reuse
```
  6fd29312
- Merge branch 'check_orphaned_users_groups' into 'master' · 8fa53ce4
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Check Orphaned Users Groups
```
  8fa53ce4
17 Mar, 2014 10 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 11f20576
  Marin Jankovski authored Mar 17, 2014
  
  11f20576
- Add change to changelog. · 1c6e93ed
  Marin Jankovski authored Mar 17, 2014
  
  1c6e93ed
- Merge pull request #6529 from MrKeiKun/system-hook-fix · b36441f4
  Sytse Sijbrandij authored Mar 17, 2014
```
Fixed some minor typos
```
  b36441f4
- Merge branch 'links_within_same_repo' into 'master' · 493c7a61
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
```
  493c7a61
- Merge branch 'mysql-to-og' into 'master' · 66c4a7db
  Dmitriy Zaporozhets authored Mar 17, 2014
```
MySQL to Postgres script
```
  66c4a7db
- Postgresql conversion script. · 70994c34
  dosire authored Mar 17, 2014
  
  70994c34
- Default value for Snippet#private · de855e24
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de855e24
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · cb43d88a
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  cb43d88a
- Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users · d5796975
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Show link to public projects for new users.
```
  d5796975
- Drop UsersGroup orphans using `rails runner` · 5e7e814e
  Jacob Vosmaer authored Mar 17, 2014
  
  5e7e814e