home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
79 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 26631f9981 Change how notification settings in profile are rendered and updated 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets f8f68d6b8c Fix few bugs related to recent notifications refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 359157c097 Introduce NotificationSetting to user interface 
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Robert Speicher 1b10724e08 Don't abuse the flash store for displaying SSH Key form errors 2016-03-03 16:13:59 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Phil HughesandRobert Speicher 1d4418bc5f Fixed failing ssh key tests 2016-03-03 16:13:55 -05:00
Phil HughesandRobert Speicher 1efe105415 SSH keys settings 
Closes #13860
 2016-03-03 16:13:55 -05:00
Robert Speicher b0ec9529e2 Don't show any "2FA required" message if it's not actually required 
Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.
 2016-02-29 13:58:36 -05:00
Robert Speicher fcab1345da Update wording for 2FA requirement notice 2016-01-23 17:56:18 -08:00
Gabriel Mazetto 1249289f89 Fixed codestyle and added 2FA documentation 2015-12-24 19:01:30 -02:00
Gabriel Mazetto b61a5bc20c specs for forced two-factor authentication and grace period 
simplified code and fixed stuffs
 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 31fb2b7702 Grace period support for TFA 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 33964469b3 WIP require two factor authentication 2015-12-24 19:00:18 -02:00
Stan Hu 9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set 
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731
 2015-10-20 07:45:48 -07:00
Peter Göbel e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Robert Speicher 259851c0d6 Bump devise-two-factor to 2.0.0 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
 2015-09-19 21:16:18 -04:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Robert Speicher 22724418d3 Add User#disable_two_factor! 
This method encapsulates all the logic for disabling 2FA on a specific
User model.
 2015-07-10 16:18:30 -04:00
Robert Speicher b6318297fc Use User#two_factor_enabled instead of otp_required_for_login 2015-06-19 15:14:37 -04:00
Robert Speicher ad049a8e52 Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') 2015-06-16 13:08:29 -04:00
Robert Speicher 1562f017b6 Spec the failure cases for PreferencesController#update 2015-06-13 17:59:12 -04:00
Robert Speicher 2bc4fd2d04 Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Robert Speicher 7b879bb8bd Bump secret key length to 32 2015-05-23 18:47:53 -04:00
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04:00
Robert Speicher 414ddc0021 Clear all 2FA-related fields when user disables the feature 2015-05-09 17:32:49 -04:00
Robert Speicher 6369d23d58 Fix nav and layout for TwoFactorAuthsController 2015-05-09 17:32:08 -04:00
Dmitriy ZaporozhetsandRobert Speicher 8ae712ae28 Render 2fa recovery codes instead of downloading it 2015-05-09 17:31:39 -04: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 cde474a49f Make 2 factor authentication work 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher ba7e2fd946 Create Two-factor authentication resource for user 2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets 4291e28af7 Merge branch 'change-primary-email' into 'master' 
Allow primary email to be set to an email that you've already added.

Fixes gitlab-com/support-forum#106.

When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.

See merge request !591
 2015-05-03 11:00:51 +00:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Douwe Maan 280a212443 Fix Profiles::PasswordsController. 2015-04-30 20:37:25 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan d386bb7808 Allow primary email to be set to an email that you've already added. 2015-04-30 16:17:03 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Senorsen 7b28218f96 Allow user to choose which email to be public 
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
 2015-04-14 19:42:48 +08:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets 9b3e156e43 Move profile groups page to dashboard 2015-03-08 17:03:30 -07:00
Douwe Maan 25e44d0530 Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S). 2015-02-13 14:44:42 +01:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets 62ed1c537e Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00