home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,115 Commits 48 Branches 340 Tags
ffaeca904d8252da1c09ffffcb9f1ff0aec98cb4
Commit Graph
1403 Commits
Author SHA1 Message Date
Marin Jankovski 020b681688 Update gitlab-shell version in documentation. 2014-03-21 14:11:36 +01:00
Dmitriy Zaporozhets c55d2345ee Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 15:04:21 +02:00
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02:00
Dmitriy Zaporozhets d4957ee78e Merge branch 'git-hooks' into 'master' 
Git Hooks
 2014-03-21 07:52:25 +00:00
Dmitriy Zaporozhets abd6d821fc Merge branch 'recursive_ldap_groups' into 'master' 
Recursive LDAP groups (ActiveDirectory only)
 2014-03-21 07:15:54 +00:00
Dmitriy Zaporozhets b8dc5d2c5f Implement 2 git hooks: tagf removal and commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:59:01 +02:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Jacob Vosmaer 8722d6bdc4 Add an API reference for AD recursive LDAP lookup 2014-03-20 13:28:10 +01:00
Dmitriy Zaporozhets e013be10d7 GitLab requires gitlab-shell v1.9.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 13:37:35 +02:00
Dmitriy Zaporozhets 450188501d Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:55:42 +02:00
Dmitriy Zaporozhets 83e83b6617 Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:53:03 +02:00
Jacob Vosmaer ab37a0954a Add support for nested Active Directory groups 2014-03-20 09:41:15 +01:00
Jacob Vosmaer cc768fddeb Reuse LDAP adapter in Group instances 2014-03-20 09:39:25 +01:00
Dmitriy Zaporozhets 729b358ff2 push via http now served via /allowed API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets f18a714f35 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 19c28822ef Add Gitlab::GitAccess class to resolve auth issues during pull/push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 32268d8dda push via http now served via /allowed API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 21:05:21 +02:00
Dmitriy Zaporozhets 7b59e2e2e6 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 21:05:21 +02:00
Dmitriy Zaporozhets b4bef5e646 Add Gitlab::GitAccess class to resolve auth issues during pull/push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 21:05:21 +02:00
Jacob Vosmaer acaf297846 Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite 
Explain what to do about legacy sqlite in database.yml
 2014-03-18 10:48:27 +01:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
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
 2014-03-18 11:15:01 +02:00
Dmitriy Zaporozhets 8fa53ce43d Merge branch 'check_orphaned_users_groups' into 'master' 
Check Orphaned Users Groups
 2014-03-18 07:14:08 +00:00
Jamey J. DeOrio 37192d5e18 Add more descriptive line for resolving sqlite error during check 2014-03-17 09:43:27 -07:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master' 
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.
 2014-03-17 14:06:08 +00:00
Jacob Vosmaer 5e7e814e81 Drop UsersGroup orphans using rails runner 2014-03-17 14:42:20 +01:00
Dmitriy Zaporozhets c02e3d441b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:29:45 +02:00
Dmitriy Zaporozhets 928b7f3bff Add tests for API project permissions info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:14:27 +02:00
Dmitriy Zaporozhets 0ea0e542a9 Remove old entities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:35:50 +02:00
Dmitriy Zaporozhets eea317795e Add current user permissions info to /api/projects/:id.json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:33:41 +02:00
Marin Jankovski f04d5bfaf6 Wiki will show relative links related to the wiki gollum repository. 2014-03-17 13:06:19 +01:00
Dmitriy Zaporozhets 7c60713e82 Move project members api to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 13:44:54 +02:00
Dmitriy Zaporozhets a7ac57a1a3 Merge pull request #6534 from dlorch/master 
JIRA project identifiers may also contain dashes '-'
 2014-03-17 13:28:39 +02:00
Dmitriy Zaporozhets fddbd7b2f0 Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-16 09:43:25 +02:00
Dmitriy Zaporozhets 39f80884db Improve developer seeds 
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 11:39:35 +02:00
Dmitriy Zaporozhets ecae936d34 Merge branch 'batch_key_import' into 'master' 
Batch Key Import
 2014-03-15 06:28:44 +00:00
Daniel Lorch 686128cd68 JIRA project identifiers may also contain dashes '-' 2014-03-14 18:08:05 +01:00
Jacob Vosmaer 4aa3ce7534 Add check for orphaned UsersGroups 2014-03-14 17:25:11 +01:00
Jacob Vosmaer 090ed21e6f Batch key import requires gitlab-shell 1.8.5 2014-03-14 15:58:47 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Dmitriy Zaporozhets a9f2903e86 Change project lookup order for api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:52 +02:00
Dmitriy Zaporozhets fa3c087a4c Clear rake task only if defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:23:28 +02:00
Dmitriy Zaporozhets 1ec106b853 Merge branch 'ldap_connections' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-14 12:58:43 +02:00
Dmitriy Zaporozhets bce8edbbcc Require gitlab-shell v1.8.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:57:26 +02:00
Jacob Vosmaer 823f89ed40 Pass LDAP adapter to finders in update_permissions 2014-03-14 11:21:50 +01:00
Dmitriy Zaporozhets b007cadf55 Fix project creation test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:19:02 +02:00
Jacob Vosmaer 2f1a59d391 Add Gitlab::LDAP::Access.open 
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
 2014-03-14 11:01:28 +01:00
Jacob Vosmaer d8ca6ed216 Add Gitlab::LDAP::Adapter.open 
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
 2014-03-14 11:01:28 +01:00
Jacob Vosmaer f41d277d61 Allow passing an adapter to Gitlab::LDAP::Person 2014-03-14 11:01:27 +01:00
Dmitriy Zaporozhets 8839339ee3 Override rake test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 11:06:10 +02:00
Dmitriy Zaporozhets f6f80659ec Override rake spec and rake spinach tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 10:44:16 +02:00