summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-30/+30
| | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-032-10/+1
|
* Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-031-10/+7
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * Move repository when project is removedDmitriy Zaporozhets2015-06-031-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Wrap group removal into serviceDmitriy Zaporozhets2015-06-032-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-021-0/+16
|\ | | | | | | | | | | | | | | | | | | Add an option to automatically sign-in with an Omniauth provider Split of !669 as requested This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication. See merge request !723
| * Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-291-0/+16
| | | | | | | | | | | | | | showing the GitLab sign-in page This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
* | Allow to configure a URL to show after sign outAlex Lossent2015-05-292-1/+2
|/
* Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ | | | | | | | | | | | | | | Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
| * Add ability to leave projectDmitriy Zaporozhets2015-05-291-1/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'user-oauth-applications' into 'master'Dmitriy Zaporozhets2015-05-292-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disallow users from registering any application to use GitLab as an OAuth provider Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264. ![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png) See merge request !742
| * | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-292-0/+9
| |/ | | | | | | as an OAuth provider
* | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ \ | |/ |/| | | | | | | | | | | User should be able to leave group. If not - show him proper message Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !743
| * User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-291-1/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+3
|\ \ | |/ |/| | | | | | | | | | | Add SAML support via Omniauth Split of !669, with doc See merge request !722
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+3
| |
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-5/+12
| | | | | | | | /:namespace_id/:project_id/merge_requests/:id/commits(.:format)
* | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-282-6/+2
| | | | | | | | | | | | | | To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Set milestone on new issue when creating issue from index with milestone ↵Douwe Maan2015-05-271-4/+4
|/ | | | filter active.
* Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-271-1/+2
|\ | | | | | | | | | | | | | | | | | | Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
| * Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-231-1/+1
| |
| * Add support for manually entering 2FA detailsRobert Speicher2015-05-231-1/+2
| |
* | Add support for Webhook note eventsStan Hu2015-05-211-1/+1
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-182-2/+18
|\
| * Add search issues/MR by numberNikita Verkhovin2015-05-182-2/+18
| |
* | Fill in email on the new password formVinnie Okada2015-05-161-1/+1
| |
* | Redirect if password reset token is expiredVinnie Okada2015-05-161-0/+20
|/ | | | | | Don't display the password editing form if the user's token is expired; redirect to the form that allows users to request a new password reset token.
* Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
|
* Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-131-2/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642
| * Improve OAuth signup error message.Douwe Maan2015-05-131-2/+9
| |
* | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-131-0/+1
|\ \ | |/ |/| | | | | | | Version check See merge request !1509
| * Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
| | * Add feature to disable version checkDmitriy Zaporozhets2015-03-101-1/+2
| | |
* | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-124-3/+124
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two-factor authentication Implement's Two-factor authentication using tokens. - [X] Authentication logic - [X] Enable/disable 2FA feature - [x] Make 2-step login process if 2FA enabled - [x] Backup codes - [x] Backup code removed after being used - [x] Check backup codes for mysql db (mention mysql limitation if applied) - [x] Add tests - [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so - [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155 Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa See merge request !474
| * | | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-111-0/+21
| | | |
| * | | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-2/+7
| | | |
| * | | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-091-2/+8
| | | |
| * | | Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | This makes it consistent with the Invalid email/password error message from the previous step.
| * | | Refactor SessionsControllerRobert Speicher2015-05-091-22/+25
| | | | | | | | | | | | | | | | | | | | Also adds test case for providing an invalid 2FA code and then a valid one without re-entering username and password.
| * | | Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-091-1/+1
| | | |
| * | | Make two-factor login work and add a feature specRobert Speicher2015-05-091-7/+24
| | | |
| * | | Fix Devise parameter sanitizer for otp_attemptRobert Speicher2015-05-091-1/+1
| | | |
| * | | Don't use hard-coded sign_in pathRobert Speicher2015-05-091-1/+1
| | | |
| * | | prepend_before_filter -> prepend_before_actionRobert Speicher2015-05-091-1/+1
| | | |
| * | | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-3/+3
| | | |
| * | | Add support for backup codesDmitriy Zaporozhets2015-05-092-1/+8
| | | |
| * | | Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap ↵Dmitriy Zaporozhets2015-05-092-1/+25
| | | | | | | | | | | | | | | | users since it is not supported
| * | | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+0
| | | |
View Lorry Controller Status