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
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
170 Commits
Author SHA1 Message Date
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov 7ddba92a39 Gitlab integration: added tests 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets ca701a9649 Improvements to LDAP::User model 
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
 2015-01-29 13:28:41 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Marin Jankovski 9b5b334a79 Remove unused feature steps. 2015-01-26 16:04:08 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 0c4bb84910 Merge pull request #7762 from jubianchi/commit-closing-issues 
Allow commit messages to close several issues at once
 2015-01-21 11:49:13 -08:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes 
for his work and help)
 2015-01-20 10:45:48 +01:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets 3197044512 Refactor push data builder. Moved it to separate class 
Also execute GitLab CI on creating tag via UI
 2015-01-11 23:51:31 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Marin Jankovski 84af3ceb9b Add spec for developers can push to protected branches. 2014-12-26 11:41:04 +01:00
Valery Sizov 73c0dfd265 Kerberos: username as identifier 2014-12-15 18:07:03 +02:00
Valery Sizov e3a419aa64 Kerberos: specs 2014-12-15 18:06:17 +02:00
Valery Sizov 2f006f89a5 fix specs after merge CE -> EE 2014-12-08 13:11:33 +02:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Valery Sizov f9a730ebb4 fix specs 2014-12-04 15:53:26 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets 06b7907c2a Fix deploy keys permission check in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 16:25:10 +02:00
Marin Jankovski 267896c35e Add a spec for rebase option. 2014-11-28 13:23:04 +01:00
Valery Sizov 5509a5e8d4 Git hook messages: wiki access fix 2014-11-24 16:25:58 +02:00
Valery Sizov ef944e83ec Git hook messages: wiki access fix 2014-11-24 16:21:35 +02:00
Valery Sizov 53bf52f191 Better message for failed pushes because of git hooks 
Conflicts:
	lib/gitlab/git_access.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-11-18 13:10:07 +02:00
Valery Sizov 3058059c0a Better message for failed pushes because of git hooks 2014-11-17 12:34:37 +02:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Valery Sizov b2e48f27a5 added some specs for gitlab_access class 2014-11-04 16:40:47 +02:00
Dmitriy Zaporozhets 876c6f2491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-04 10:48:38 +02:00
Ciro Santilli 71ed0ab069 Fix push not allowed to protected branch if 
commit starts with 7 zeros.
 2014-11-03 20:37:47 +01:00
Andrey KrivkoandDmitriy Zaporozhets bafd30f92c Session API: Use case-insensitive authentication like in UI 2014-10-30 18:29:18 +02:00
Valery Sizov 9a3d36505f Merge branch 'ee_master' into 7-4-stable-ee 
Conflicts:
	VERSION
 2014-10-27 13:17:14 +02:00
Valery Sizov dd559674e2 Merge branch '7-4-stable-ee' into ce_stable 
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
 2014-10-24 13:37:25 +03:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Jan-Willem van der Meer 7389ab154e Use server specific admin_group 2014-10-17 17:16:29 +02:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer fad588f2be Remove LDAP save test 
This is handled within the LDAP class
 2014-10-16 17:18:40 +02:00
Jan-Willem van der Meer 02fb3116d5 Add provider to LdapGroupLink tests 2014-10-16 12:28:47 +02:00
Jan-Willem van der Meer d9a8789166 Fix JIRA issue parsing 2014-10-15 07:49:35 +02:00
Jan-Willem van der Meer c1865b69cd Fix merge conflicts 
Due to the complicated merge, part of the new functionalilty is inserted here
 2014-10-14 23:41:07 +02:00
Jan-Willem van der Meer 4ace6dbf6c Fix merge conflicts 2014-10-14 17:31:28 +02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Jan-Willem van der Meer 23b692c701 Add specs for authentication and config 2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer 5e1c39cb78 Merge tests to support Multiple LDAP groups 2014-10-13 17:33:44 +02:00