Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve Git access error messages. | Douwe Maan | 2015-05-13 | 3 | -45/+44 |
* | Improve text on error pages. | Douwe Maan | 2015-05-13 | 6 | -17/+32 |
* | Merge branch 'fix-avatar-removal' into 'master' | Hannes Rosenögger | 2015-05-12 | 7 | -4/+57 |
|\ | |||||
| * | Fix bug where avatar filenames were not actually deleted from the database du... | Stan Hu | 2015-05-07 | 7 | -5/+57 |
* | | Merge branch 'ad-block_auto_created_users' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 3 | -5/+25 |
|\ \ | |||||
| * | | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users | Douwe Maan | 2015-05-12 | 3 | -5/+25 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-12 | 1 | -51/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'remove-mysql-index-conversion-from-docs' into 'master' | Douwe Maan | 2015-05-12 | 1 | -51/+4 |
| |\ \ \ | |||||
| | * | | | Update docs in line with mysql-postgresql-converter changes.remove-mysql-index-conversion-from-docs | Douwe Maan | 2015-05-12 | 1 | -51/+4 |
| |/ / / | |||||
* | | | | Merge branch 'migration_style_guide' into 'master' | Sytse Sijbrandij | 2015-05-12 | 1 | -1/+47 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | update migration style guide | Valery Sizov | 2015-05-12 | 1 | -1/+47 |
* | | | | Merge branch 'note-role' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 3 | -9/+29 |
|\ \ \ \ | |||||
| * | | | | Show user roles by comments. | Douwe Maan | 2015-05-12 | 3 | -9/+29 |
| | |/ / | |/| | | |||||
* | | | | Fix Gemfile.lock | Dmitriy Zaporozhets | 2015-05-12 | 2 | -2/+2 |
* | | | | Merge branch 'rs-system-note' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 13 | -729/+754 |
|\ \ \ \ | |||||
| * | | | | Reorganize SystemNoteService spec a bitrs-system-note | Robert Speicher | 2015-05-11 | 1 | -13/+17 |
| * | | | | Refactor SystemNoteService.cross_reference_disallowed? | Robert Speicher | 2015-05-11 | 1 | -6/+13 |
| * | | | | Spec SystemNoteService.cross_reference_disallowed? | Robert Speicher | 2015-05-11 | 1 | -2/+26 |
| * | | | | Simplify Note model specs | Robert Speicher | 2015-05-11 | 2 | -215/+36 |
| * | | | | Check if `system` is truthy in `Note.cross_reference?` | Robert Speicher | 2015-05-11 | 1 | -1/+1 |
| * | | | | Update SystemNoteService method naming conventions | Robert Speicher | 2015-05-11 | 7 | -205/+202 |
| * | | | | Remove legacy special case for emphasized reference notes | Robert Speicher | 2015-05-11 | 2 | -49/+9 |
| * | | | | Add migration to convert legacy system notes | Robert Speicher | 2015-05-11 | 2 | -1/+17 |
| * | | | | Add a SystemNoteService class | Robert Speicher | 2015-05-11 | 11 | -479/+683 |
| * | | | | Simplify `Note#upvote?` and `Note#downvote?` | Robert Speicher | 2015-05-10 | 1 | -17/+11 |
| * | | | | Note's voting specs don't need to persist to the database | Robert Speicher | 2015-05-10 | 1 | -18/+16 |
* | | | | | Merge branch 'brakeman-level' | Dmitriy Zaporozhets | 2015-05-12 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | We would like to pass 'brakeman -w2' | Jacob Vosmaer | 2015-05-11 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'project-page' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 8 | -81/+94 |
|\ \ \ \ \ | |||||
| * | | | | | Move "Forked from" above "Version".project-page | Douwe Maan | 2015-05-12 | 1 | -8/+9 |
| * | | | | | Move clone panel to bottom of project sidebar. | Douwe Maan | 2015-05-12 | 1 | -3/+3 |
| * | | | | | Restructure project sidebar. | Douwe Maan | 2015-05-12 | 2 | -65/+81 |
| * | | | | | Fix alignment of ref picker, breadcrumb and buttons. | Douwe Maan | 2015-05-12 | 4 | -14/+3 |
| * | | | | | Add icons to more tabs. | Douwe Maan | 2015-05-12 | 2 | -1/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fix_migration' into 'master' | Valery Sizov | 2015-05-12 | 2 | -2/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Make migrations reversiblefix_migration | Valery Sizov | 2015-05-07 | 2 | -2/+9 |
* | | | | | | Merge branch '2fa' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 26 | -10/+566 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bump attr_encrypted | Dmitriy Zaporozhets | 2015-05-12 | 2 | -10/+4 |
| * | | | | | | Handle password reset for users with 2FA enabled2fa | Robert Speicher | 2015-05-11 | 3 | -2/+76 |
| * | | | | | | Remove extra `devise` call that got added by accident | Robert Speicher | 2015-05-10 | 1 | -3/+0 |
| * | | | | | | Remove unnecessary User#login accessor override | Robert Speicher | 2015-05-09 | 1 | -5/+0 |
| * | | | | | | Add CHANGELOG entry | Robert Speicher | 2015-05-09 | 1 | -1/+1 |
| * | | | | | | Clear all 2FA-related fields when user disables the feature | Robert Speicher | 2015-05-09 | 2 | -2/+133 |
| * | | | | | | Prevent "You are already signed in." error message upon 2FA login | Robert Speicher | 2015-05-09 | 2 | -3/+26 |
| * | | | | | | Move "invalid 2FA code" error message to the flash | Robert Speicher | 2015-05-09 | 2 | -4/+1 |
| * | | | | | | Autofocus the pin field on 2FA enable form | Robert Speicher | 2015-05-09 | 1 | -1/+1 |
| * | | | | | | Add otp_attempt to filtered parameters | Robert Speicher | 2015-05-09 | 1 | -1/+1 |
| * | | | | | | Generate 10 2FA backup codes instead of the default of 5 | Robert Speicher | 2015-05-09 | 2 | -3/+3 |
| * | | | | | | Add :two_factor trait to User factory | Robert Speicher | 2015-05-09 | 2 | -8/+11 |
| * | | | | | | Fix 2FA backup code removal | Robert Speicher | 2015-05-09 | 2 | -7/+8 |