summaryrefslogtreecommitdiff
Commit message (Expand)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.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
|\ \
| * | 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
| * | 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
| * | 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
|\ \ \
| * | | 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
|\ \ \
| * | | 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 reversiblefix_migrationValery Sizov2015-05-072-2/+9
* | | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-1226-10/+566
|\ \ \ \
| * | | | Bump attr_encryptedDmitriy Zaporozhets2015-05-122-10/+4
| * | | | 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
| * | | | 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
| * | | | 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