summaryrefslogtreecommitdiff
path: root/app/views/devise
Commit message (Collapse)AuthorAgeFilesLines
* Allow password authentication to be disabled entirelyMarkus Koller2017-11-235-9/+9
|
* Merge branch 'master' into ↵Douwe Maan2017-10-051-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * Changed account confirmation line to e-mail text. This MR fixes issue #13637bitsapien2017-09-281-2/+3
| | | | | | | | added changelog
* | fix whitespaceBrett Walker2017-09-241-1/+1
| |
* | small cleanup changes based on feedbackBrett Walker2017-09-232-9/+2
| |
* | move #cta properly under #contentBrett Walker2017-09-232-9/+9
| |
* | refactored the account confirmation into a partial. Also made theBrett Walker2017-09-236-31/+38
| | | | | | | | text in the `.text` version consistent with the `.html` version
* | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-234-14/+36
|/ | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* Add missing classes to omniauth remember-me checkbox and add correct font-sizeJedidiah2017-09-141-3/+5
|
* add padding above Remember Me for social login35178-remember-me-in-omniauth-box-seems-too-close-to-iconsSimon Knox2017-07-201-2/+2
| | | | also fix case
* Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-134-8/+8
| | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-1/+4
|\ | | | | | | | | | | | | Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
| * Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-061-1/+1
| | | | | | | | | | | | | | - Change double quotes to single quotes. - Why is `OmniAuth.config.full_host` being reassigned in the integration test? - Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task - Other minor changes
| * Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-061-14/+0
| |
| * Add integration tests around OAuth login.Timothy Andrew2017-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was previously a test for `saml` login in `login_spec`, but this didn't seem to be passing. A lot of things didn't seem right here, and I suspect that this test hasn't been running. I'll investigate this further. - It took almost a whole working day to figure out this line: OmniAuth.config.full_host = ->(request) { request['REQUEST_URI'].sub(request['REQUEST_PATH'], '') } As always, it's obvious in retrospect, but it took some digging to figure out tests were failing and returning 404s during the callback phase. - Test all OAuth providers - github, twitter, bitbucket, gitlab, google, and facebook
| * Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-061-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | - Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']`. - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
* | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-4/+1
| | | | | | This reverts merge request !11963
* | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Honor the "Remember me" parameter for OAuth-based login Closes #18000 See merge request !11963
| * | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | - Change double quotes to single quotes. - Why is `OmniAuth.config.full_host` being reassigned in the integration test? - Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task - Other minor changes
| * | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-031-14/+0
| | |
| * | Add integration tests around OAuth login.Timothy Andrew2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was previously a test for `saml` login in `login_spec`, but this didn't seem to be passing. A lot of things didn't seem right here, and I suspect that this test hasn't been running. I'll investigate this further. - It took almost a whole working day to figure out this line: OmniAuth.config.full_host = ->(request) { request['REQUEST_URI'].sub(request['REQUEST_PATH'], '') } As always, it's obvious in retrospect, but it took some digging to figure out tests were failing and returning 404s during the callback phase. - Test all OAuth providers - github, twitter, bitbucket, gitlab, google, and facebook
| * | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-031-1/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | - Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']` - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
* | add margin between captcha and register button29000-recaptcha-marginSimon Knox2017-07-031-1/+1
|/
* use common devise layout and use heading styleAlexis Reigel2017-06-134-45/+41
|
* use common layout for devise mailerAlexis Reigel2017-06-132-22/+20
|
* Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-241-1/+1
| | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* Resolve ""Username or email" label on login form does not point to its ↵Tim Zallmann2017-05-162-3/+3
| | | | corresponding input field"
* Corrected alignment for the remember-me checkbox in the login viewJose Ivan Vargas2017-03-221-1/+1
|
* Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-091-1/+1
|
* move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-071-1/+1
|
* Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-1/+1
|
* Add active_when helperSemyon Pupkov2017-02-152-2/+2
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
* Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-1/+1
|
* Remove turbolinks.Bryce Johnson2017-02-021-1/+1
|
* Fix ImplicitDiv Haml lint failureRobert Speicher2017-01-041-1/+1
|
* Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-0/+3
|\ | | | | | | | | | | | | Add email confirmation field to registration form Closes #3053 See merge request !7432
| * Add email and password confirmation fields to registration formDrew Blessing2017-01-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
* | HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-316-14/+14
| |
* | HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-313-7/+7
| |
* | HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-312-2/+2
| |
* | Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-271-1/+1
|/ | | | Added tests
* Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' Fatih Acet2016-12-091-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists ## What does this MR do? Fixes issue: 15081 Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists This is done by saving into a cookie when the active tab changes and by always selecting that tab when the page is loaded. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? In order to fix the issue: 15081 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #15081 See merge request !7314
| * Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs ExistsJacopo2016-12-021-0/+1
| | | | | | | | | | | | | | When ldap is enabled and use "Standard" authentication method, if authentication fails the correct tab remain selected. This is done by saving into localStorage when the active tab changes and by always selecting that tab when the page is loaded.
* | Remove confirmation.scssAnnabel Dunstone Gray2016-12-061-3/+4
|/
* Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-181-2/+2
|
* Allow registering users where the username contains dots (.).Timothy Andrew2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | Javascript does not support the negative lookbehind assertion (?<!) used in the Ruby regex (to disallow usernames ending in `.git` or `.atom`. Getting the client side code to fully support this format is non-trivial, since we'd either have to heavily complicate the regex used, or modify the frontend code to support more complex validation schemes (it currently uses HTML5 validations). The pragmatic choice is to create a `Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE` regex to serve as a Javascript-compatible version of `NAMESPACE_REGEX_STR`. The client-side code will not display an error for usernames ending in `.git` and `.atom`, but these will be caught by the server-side validation.
* Fix no "Register" tab if ldap auth is enabled (#24038)Luc Didry2016-11-101-0/+3
| | | | | This commit is dedicated to GuilhemB, thanks for supporting me on Tipeee :-)
* Change show-gl-field-errors to gl-show-field-errorsBryce Johnson2016-11-029-9/+9
|
* Upgrade gl_field_errors to support more use cases.Bryce Johnson2016-11-011-1/+1
|
* Merge branch 'register-tab' into 'master' Jacob Schatz2016-10-251-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show register tab if signup enabled. ## What does this MR do? Fixes a regression where the register tab is activated, even if sign-up enabled is not activated in application_settings. ## Screenshots (if relevant) When signup is disabled: ![Screen_Shot_2016-10-22_at_8.56.23_PM](/uploads/bd0fa5f27114779c0d290a8151c1c253/Screen_Shot_2016-10-22_at_8.56.23_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23654 See merge request !7058