home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,140 Commits 48 Branches 340 Tags
2bfa02bb3ccb2b176fa936ce7a70b75eeedce9ef
Commit Graph
468 Commits
Author SHA1 Message Date
Jacob Vosmaer 2bfa02bb3c Check for errors in Adapter#dn_matches_filter? 2014-03-28 14:29:04 +01:00
Dmitriy Zaporozhets 713815df14 Skip git hooks if oldrev or newrev is nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 17:24:53 +02:00
Dmitriy Zaporozhets 3a293fa966 Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
 2014-03-25 10:12:59 +02:00
Dmitriy Zaporozhets a261c5fc94 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:09:33 +02:00
Dmitriy Zaporozhets b8d83d2538 Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:05:28 +02: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 7dd18a3ec8 Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 14:52:30 +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 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 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 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
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 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 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
Daniel Lorch 686128cd68 JIRA project identifiers may also contain dashes '-' 2014-03-14 18:08:05 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Jacob Vosmaer 823f89ed40 Pass LDAP adapter to finders in update_permissions 2014-03-14 11:21:50 +01: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
Jacob Vosmaer 56df3dbff2 Add Gitlab::LDAP::Access.open 
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
 2014-03-14 08:55:50 +01:00
Jacob Vosmaer af53aa9072 Add Gitlab::LDAP::Adapter.open 
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
 2014-03-14 08:53:46 +01:00
Jacob Vosmaer 5a616649b5 Allow passing an adapter to Gitlab::LDAP::Person 2014-03-14 08:52:57 +01:00
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets 0fdab6a747 Remove copyright 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:09:45 +02:00
Dmitriy Zaporozhets daa7f077db Port LDAP code from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 14:48:08 +02:00
mk 61a72bc2e2 Allow underscore as the first char for project names. 
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
 2014-03-06 14:08:40 +01:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
Jacob Vosmaer 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +01:00
Jacob Vosmaer 38f4b61a58 Make it possible to call Gitlab::Popen.popen 2014-02-25 11:58:58 +01:00
Jacob Vosmaer 8016cefafe Make the Gitlab::Popen path argument optional 2014-02-25 11:58:22 +01:00
Jacob Vosmaer 0432bdf19e Change Gitlab::Popen to use arrays for commands 2014-02-25 11:57:42 +01:00
Jacob Vosmaer 0bfc45d518 Dump LDAP objects into the log for debugging 2014-02-12 15:51:30 +01:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +02:00
Dmitriy Zaporozhets da34e008c3 Merge pull request #5294 from dalehamel/master 
Ensure directory exists before changing in popen
 2014-02-04 07:21:35 -08:00
Dmitriy Zaporozhets 5221dbfee7 Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:57:36 +00:00
Corobi 17f7da3d97 improve upgrader "latest version" message 2014-01-25 23:33:55 +00:00
Jason Hollingsworth 71c157e43b Add files to path blacklist. 
Remove empty ErrorsController
 2014-01-24 20:06:44 -06:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00