summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update docs in line with mysql-postgresql-converter changes.remove-mysql-index-conversion-from-docsDouwe Maan2015-05-121-51/+4
|
* Merge branch 'note-role' into 'master'Dmitriy Zaporozhets2015-05-123-9/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show user roles by comments. I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context. ![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png) On hover, the note actions replace the role: ![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png) --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639
| * Show user roles by comments.Douwe Maan2015-05-123-9/+29
| |
* | Fix Gemfile.lockDmitriy Zaporozhets2015-05-122-2/+2
| |
* | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-1213-729/+754
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595
| * | Reorganize SystemNoteService spec a bitrs-system-noteRobert Speicher2015-05-111-13/+17
| | |
| * | Refactor SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-6/+13
| | |
| * | Spec SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-2/+26
| | |
| * | Simplify Note model specsRobert Speicher2015-05-112-215/+36
| | |
| * | Check if `system` is truthy in `Note.cross_reference?`Robert Speicher2015-05-111-1/+1
| | |
| * | Update SystemNoteService method naming conventionsRobert Speicher2015-05-117-205/+202
| | | | | | | | | | | | | | | Now the verb comes first, and there is no restriction on singular/plural.
| * | Remove legacy special case for emphasized reference notesRobert Speicher2015-05-112-49/+9
| | |
| * | Add migration to convert legacy system notesRobert Speicher2015-05-112-1/+17
| | |
| * | Add a SystemNoteService classRobert Speicher2015-05-1111-479/+683
| | | | | | | | | | | | | | | There's a lot of code in the Note model that only deals with creating system notes, so we're going to split that into its own class.
| * | Simplify `Note#upvote?` and `Note#downvote?`Robert Speicher2015-05-101-17/+11
| | |
| * | Note's voting specs don't need to persist to the databaseRobert Speicher2015-05-101-18/+16
| | |
* | | Merge branch 'brakeman-level'Dmitriy Zaporozhets2015-05-121-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/tasks/brakeman.rake
| * | | We would like to pass 'brakeman -w2'Jacob Vosmaer2015-05-111-0/+2
| |/ /
* | | Merge branch 'project-page' into 'master'Dmitriy Zaporozhets2015-05-128-81/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure project sidebar and add more icons. I moved the repository stuff down (including the clone bar), and the project/contribution stuff up. I also added more icons, to the sidebar and tabs on other pages. --- ![Screen_Shot_2015-05-12_at_10.29.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ada4a77a07913571e5ac4f00fdd182b9/Screen_Shot_2015-05-12_at_10.29.36.png) See merge request !633
| * | | Move "Forked from" above "Version".project-pageDouwe Maan2015-05-121-8/+9
| | | |
| * | | Move clone panel to bottom of project sidebar.Douwe Maan2015-05-121-3/+3
| | | |
| * | | Restructure project sidebar.Douwe Maan2015-05-122-65/+81
| | | |
| * | | Fix alignment of ref picker, breadcrumb and buttons.Douwe Maan2015-05-124-14/+3
| | | |
| * | | Add icons to more tabs.Douwe Maan2015-05-122-1/+8
| | |/ | |/|
* | | Merge branch 'fix_migration' into 'master'Valery Sizov2015-05-122-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make migrations reversible /cc @jacobvosmaer @marin See merge request !622
| * | | Make migrations reversiblefix_migrationValery Sizov2015-05-072-2/+9
| | | |
* | | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-1226-10/+566
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Bump attr_encryptedDmitriy Zaporozhets2015-05-122-10/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-113-2/+76
| | | | |
| * | | | Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
| | | | |
| * | | | Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
| | | | |
| * | | | Add CHANGELOG entryRobert Speicher2015-05-091-1/+1
| | | | |
| * | | | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-092-2/+133
| | | | |
| * | | | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-092-3/+26
| | | | |
| * | | | Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-092-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This makes it consistent with the Invalid email/password error message from the previous step.
| * | | | Autofocus the pin field on 2FA enable formRobert Speicher2015-05-091-1/+1
| | | | |
| * | | | Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
| | | | |
| * | | | Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-092-3/+3
| | | | |
| * | | | Add :two_factor trait to User factoryRobert Speicher2015-05-092-8/+11
| | | | |
| * | | | Fix 2FA backup code removalRobert Speicher2015-05-092-7/+8
| | | | |
| * | | | Make otp_backup_codes a text fieldRobert Speicher2015-05-092-1/+6
| | | | |
| * | | | Quotes, icon helper in profiles/accounts/show viewRobert Speicher2015-05-091-5/+5
| | | | |
| * | | | Re-annotate User modelRobert Speicher2015-05-092-0/+10
| | | | |
| * | | | Add a hint on login form about using a recovery codeRobert Speicher2015-05-091-0/+1
| | | | |
| * | | | Improve copy for enabling 2FARobert Speicher2015-05-092-4/+5
| | | | |
| * | | | Update copy for generating new recovery codesRobert Speicher2015-05-091-4/+4
| | | | |
| * | | | Refactor SessionsControllerRobert Speicher2015-05-093-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | 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-092-2/+2
| | | | |
| * | | | Add page titles for two_factor_auths viewsRobert Speicher2015-05-093-0/+6
| | | | |
| * | | | Make two-factor login work and add a feature specRobert Speicher2015-05-092-7/+106
| | | | |
View Lorry Controller Status