home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
44 Commits
Author SHA1 Message Date
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
Douwe Maan 44458f3ca2 Add "Remember me" checkbox to LDAP signin form. 2015-06-05 14:37:01 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Robert Speicher 0ad9fc60ec Enable 2FA for LDAP logins 2015-05-14 14:45:31 -04:00
Douwe Maan 17a41547a0 Improve OAuth signup error message. 2015-05-13 09:41:56 +02:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Dmitriy Zaporozhets 03c8bf39e1 When add new social account - redirect to accounts page and show notice message 2015-02-08 00:53:31 -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
Valery Sizov 058f223b01 ForbiddenAction constant fix 2015-01-12 09:30:52 -08:00
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Dmitriy Zaporozhets 966f68b33e Refactor error message a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 13:15:59 +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 92c184a57f Disallow new users from Oauth signup if allow_single_sign_on is disabled 
Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677
 2014-10-16 11:46:40 +02:00
Jan-Willem van der Meer fc5bfd1dc1 Move dynamic omniauth declarations to initializer 2014-10-14 09:31:06 +02:00
Jan-Willem van der Meer a7e071e982 Add refactoring for multiple LDAP server support 
These changes are ported from EE to CE. Apply changes for app directory
 2014-10-13 13:39:54 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Marin JankovskiandDmitriy Zaporozhets 49c9e8ec02 Use an error page when oauth fails. 2014-06-24 15:30:29 +03:00
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Jacob Vosmaer 8761dd2a6f Check LDAP user filter during sign-in 2014-06-13 08:14:34 +02:00
Dmitriy Zaporozhets 9028999c93 Use new OAuth classes 2013-09-04 00:06:29 +03:00
Dmitriy Zaporozhets 6bf117c601 Mode User+LDAP functionality from Gitlab::Auth 2013-09-02 23:35:40 +03:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Florian Unglaub 1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub 6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Florian Unglaub 36ffdf36b9 Merge issue fixed 2012-08-24 15:40:44 +02:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx 366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Jakub Jirutka fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
Pat Thoyts a2d244ec06 Handle LDAP missing credentials error with a flash message. 
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.

This resolves issue #1077.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-21 09:04:05 +01:00
Pat Thoyts f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
Steve Prentice 2bb2dee057 Use the omniauth-ldap info object instead of the raw ldap info in extra. 
This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.

This makes the LDAP auth compatible with most OpenLDAP servers as well.
 2012-02-17 09:10:50 -08:00
vsizov d6a0b8f428 LDAP done 2012-01-28 16:23:17 +03:00