home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,846 Commits 48 Branches 340 Tags
master
Commit Graph
45 Commits
Author SHA1 Message Date
Grzegorz Bizon 28bafd5354 Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Robert Speicher 5844a21a0a Use a custom Devise failure app to handle unauthenticated .zip requests 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
 2016-03-08 23:49:30 -05:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master' 
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
 2015-12-21 17:53:20 +00:00
tduehr 8e3f1fa629 add CAS authentication support 2015-12-14 21:43:41 -06:00
Drew Blessing be41d84fb0 Allow account unlock via email 2015-12-14 15:35:02 -06:00
Drew Blessing f4ec906e90 Use devise paranoid mode and ensure the same message is returned every time 
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
 2015-12-09 18:40:37 -06:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -04:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Dmitriy ZaporozhetsandRobert Speicher 802fcd051f Add support for backup codes 2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher 50a2a229e7 Fix rubocop complain 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher 7302395142 Init 2 factor authentication for user model 2015-05-09 17:31:07 -04:00
Stan Hu 4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications 
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
 2015-05-01 22:57:10 -07:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00
Sytse Sijbrandij 31bf578d67 Increase password reset timeout since other people trigger it when they create an account for you. 2015-01-23 10:55:12 -08:00
Jan-Willem van der Meer dcf6c26075 Only enable LDAP providers if LDAP is enabled 2014-10-15 09:53:16 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer e1cf9c15eb Apply configuration changes for Multiple LDAP servers 2014-10-13 14:04:10 +02:00
Marin Jankovski 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02:00
Jacob Vosmaer 7dfb678df9 Revert "Actually use the 'user_filter' configuration option" 
This reverts commit e9d4587ff1, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
 2014-05-27 15:53:04 +02:00
Travis Odom e9d4587ff1 Actually use the 'user_filter' configuration option 2014-04-21 15:48:42 +00:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author 
This changes the email "From" field from "gitlab@example.com" to either:

* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.

Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
 2014-02-19 18:25:18 +01:00
Athos Ribeiro 84408015cd Change Devise.confirm_within to Devise.allow_unconfirmed_access_for 
According to Devise's changelog
(https://github.com/plataformatec/devise/blob/master/CHANGELOG.md),
Devise.confirm_within was deprecated in favor of
Devise.allow_unconfirmed_access_for in version 2.0.0.
 2014-02-03 21:20:36 -05:00
Raffael Schmid 568d1c27c5 refactor omniauth configuration method 
This refactoring allows a user to use omniauth providers which do not
use ```app_id``` and ```app_secret``` without needing to change the
devise configuration.
 2013-12-30 13:26:35 +01:00
Dmitriy Zaporozhets ac5842d970 Migrate application to rails 4 step 1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:26 +02:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 0461760f21 Minimal password length increased 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 18:11:03 +02:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User 
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
 2013-10-15 09:56:04 +03:00
Izaak Alpert 1a31cb2c37 Update the proc/lamda to be consistent 
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
 2013-07-18 09:33:12 -04:00
Izaak Alpert 089605fe6b Allow the ldap logins with email or username 
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
 2013-07-18 09:33:12 -04:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets 9d92433a7c login with both email or username 2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets ed9543ff5d update devise gem 2013-02-28 21:06:16 +02:00
Aaron Stone aec1a84042 Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash. 2012-12-23 16:12:53 -08:00
Riyad Preukschas 757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Nihad Abbasov 6533711825 enable lockable strategy for users 2012-07-06 00:05:31 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets b612497903 Fixed devise email_from, reordered initalizers 2012-04-06 01:28:37 +03:00
Pat Thoyts 6e27350aac Move OmniAuth configuration details into a non-revision controlled file. 
Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-03-23 15:35:55 +00:00
Valery Sizov c083df0570 LDAP BASE IMPLEMENRTATION 2012-01-28 13:11:21 +03:00
Nihad Abbasov 003bf61258 add auth token for users 2011-11-15 11:08:05 +04:00
gitlabhq 9ba1224867 init commit 2011-10-09 00:36:38 +03:00