Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 '2fa' into 'master' | Dmitriy Zaporozhets | 2015-05-12 | 12 | -8/+222 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Handle password reset for users with 2FA enabled2fa | Robert Speicher | 2015-05-11 | 1 | -0/+21 | |
| * | | | | | | 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 | |
| * | | | | | | Clear all 2FA-related fields when user disables the feature | Robert Speicher | 2015-05-09 | 1 | -2/+7 | |
| * | | | | | | Prevent "You are already signed in." error message upon 2FA login | Robert Speicher | 2015-05-09 | 1 | -2/+8 | |
| * | | | | | | 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 | |
| * | | | | | | Generate 10 2FA backup codes instead of the default of 5 | Robert Speicher | 2015-05-09 | 1 | -1/+1 | |
| * | | | | | | Fix 2FA backup code removal | Robert Speicher | 2015-05-09 | 1 | -0/+3 | |
| * | | | | | | Quotes, icon helper in profiles/accounts/show view | Robert Speicher | 2015-05-09 | 1 | -5/+5 | |
| * | | | | | | Re-annotate User model | Robert Speicher | 2015-05-09 | 1 | -0/+5 | |
| * | | | | | | Add a hint on login form about using a recovery code | Robert Speicher | 2015-05-09 | 1 | -0/+1 | |
| * | | | | | | Improve copy for enabling 2FA | Robert Speicher | 2015-05-09 | 2 | -4/+5 | |
| * | | | | | | Update copy for generating new recovery codes | Robert Speicher | 2015-05-09 | 1 | -4/+4 | |
| * | | | | | | Refactor SessionsController | Robert Speicher | 2015-05-09 | 2 | -23/+25 | |
| * | | | | | | Fix nav and layout for TwoFactorAuthsController | Robert Speicher | 2015-05-09 | 2 | -2/+2 | |
| * | | | | | | Add page titles for two_factor_auths views | Robert Speicher | 2015-05-09 | 3 | -0/+6 | |
| * | | | | | | Make two-factor login work and add a feature spec | Robert Speicher | 2015-05-09 | 1 | -7/+24 | |
| * | | | | | | Update User model for two-factor auth | Robert Speicher | 2015-05-09 | 1 | -2/+10 | |
| * | | | | | | Update login views for two-factor auth | Robert Speicher | 2015-05-09 | 2 | -6/+2 | |
| * | | | | | | Fix Devise parameter sanitizer for otp_attempt | Robert Speicher | 2015-05-09 | 1 | -1/+1 | |
| * | | | | | | Don't use hard-coded sign_in path | Robert Speicher | 2015-05-09 | 1 | -1/+1 | |
| * | | | | | | prepend_before_filter -> prepend_before_action | Robert Speicher | 2015-05-09 | 1 | -1/+1 | |
| * | | | | | | Be consistent with what we call the 2FA feature | Robert Speicher | 2015-05-09 | 4 | -11/+13 | |
| * | | | | | | Update copy for recovery codes | Robert Speicher | 2015-05-09 | 1 | -5/+4 | |
| * | | | | | | Render 2fa recovery codes instead of downloading it | Dmitriy Zaporozhets | 2015-05-09 | 5 | -11/+27 | |
| * | | | | | | Add support for backup codes | Dmitriy Zaporozhets | 2015-05-09 | 3 | -13/+31 | |
| * | | | | | | Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap u... | Dmitriy Zaporozhets | 2015-05-09 | 5 | -18/+59 | |
| * | | | | | | Fix rubocop complain | Dmitriy Zaporozhets | 2015-05-09 | 2 | -2/+1 | |
| * | | | | | | Make 2 factor authentication work | Dmitriy Zaporozhets | 2015-05-09 | 3 | -9/+37 | |
| * | | | | | | Create Two-factor authentication resource for user | Dmitriy Zaporozhets | 2015-05-09 | 3 | -0/+47 | |
| * | | | | | | Init 2 factor authentication for user model | Dmitriy Zaporozhets | 2015-05-09 | 2 | -2/+6 | |
* | | | | | | | Merge branch 'commit_time_timezone' into 'master' | Douwe Maan | 2015-05-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix commit time being displayed in the wrong timezone in some cases | Hannes Rosenögger | 2015-05-07 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'create-merge-request' into 'master' | Dmitriy Zaporozhets | 2015-05-11 | 7 | -28/+50 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix commits feed button.create-merge-request | Douwe Maan | 2015-05-10 | 1 | -4/+4 | |
| * | | | | | | | Improve create_mr_button? performance. | Douwe Maan | 2015-05-09 | 1 | -5/+4 | |
| * | | | | | | | Add Merge Request button to branches page. | Douwe Maan | 2015-05-09 | 1 | -4/+7 | |
| * | | | | | | | Add Create Merge Request buttons to commits page and push event. | Douwe Maan | 2015-05-09 | 4 | -21/+40 | |
| * | | | | | | | Link Commits tab to current branch from Compare page. | Douwe Maan | 2015-05-09 | 2 | -2/+3 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Don't symbolize params.params-to-sym | Douwe Maan | 2015-05-11 | 1 | -5/+5 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'bug/fix-duplicate-deploy-keys' into 'master' | Marin Jankovski | 2015-05-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Don't show duplicate deploy keys. Fixes #1516 | Maran | 2015-05-08 | 1 | -1/+1 | |
| | |/ / / | |/| | | |