home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Robert Speicher ff3a62aad1 Remove legacy special case for emphasized reference notes 2015-05-11 00:01:15 -04:00
Robert Speicher 48e6fb532a Add a SystemNoteService class 
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.
 2015-05-11 00:01:01 -04:00
Robert Speicher 0e89ff0fb0 Simplify Note#upvote? and Note#downvote? 2015-05-10 23:56:15 -04:00
Jakub Jirutka f7adac87fe Extract handling of relative file links to RelativeLinkFilter 2015-05-11 02:07:26 +02:00
Robert Speicher 19b897e998 Remove extra devise call that got added by accident 2015-05-10 19:13:47 -04:00
Marin Jankovski 6fdc51f81d Merge branch 'bug/fix-duplicate-deploy-keys' into 'master' 
Don't show duplicate deploy keys

This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects.

See merge request !629
 2015-05-10 07:21:39 +00:00
Douwe Maan aa4d199044 Fix commits feed button. 2015-05-10 00:39:20 +02:00
Douwe Maan a3edd473b9 Improve create_mr_button? performance. 2015-05-09 23:51:50 +02:00
Robert Speicher 11989d62d0 Remove unnecessary User#login accessor override 2015-05-09 17:39:16 -04:00
Robert Speicher 414ddc0021 Clear all 2FA-related fields when user disables the feature 2015-05-09 17:32:49 -04:00
Robert Speicher 5cd526f77f Prevent "You are already signed in." error message upon 2FA login 2015-05-09 17:32:49 -04:00
Robert Speicher 76873ce4a4 Move "invalid 2FA code" error message to the flash 
This makes it consistent with the Invalid email/password error message
from the previous step.
 2015-05-09 17:32:49 -04:00
Robert Speicher 3fb0fedd04 Autofocus the pin field on 2FA enable form 2015-05-09 17:32:49 -04:00
Robert Speicher c845347b23 Generate 10 2FA backup codes instead of the default of 5 2015-05-09 17:32:48 -04:00
Robert Speicher b050bb5bad Fix 2FA backup code removal 2015-05-09 17:32:48 -04:00
Robert Speicher 2ad1334d9e Quotes, icon helper in profiles/accounts/show view 2015-05-09 17:32:24 -04:00
Robert Speicher 661d09a22b Re-annotate User model 2015-05-09 17:32:24 -04:00
Robert Speicher a4267033f2 Add a hint on login form about using a recovery code 2015-05-09 17:32:09 -04:00
Robert Speicher 8eb577ae98 Improve copy for enabling 2FA 2015-05-09 17:32:09 -04:00
Robert Speicher 4fca1fc5ab Update copy for generating new recovery codes 2015-05-09 17:32:09 -04:00
Robert Speicher 32971b0af4 Refactor SessionsController 
Also adds test case for providing an invalid 2FA code and then a valid
one without re-entering username and password.
 2015-05-09 17:32:09 -04:00
Robert Speicher 6369d23d58 Fix nav and layout for TwoFactorAuthsController 2015-05-09 17:32:08 -04:00
Robert Speicher c891ef9337 Add page titles for two_factor_auths views 2015-05-09 17:32:08 -04:00
Robert Speicher 5520397f04 Make two-factor login work and add a feature spec 2015-05-09 17:32:08 -04:00
Robert Speicher 66bc758e2b Update User model for two-factor auth 2015-05-09 17:32:05 -04:00
Robert Speicher 6fa2942920 Update login views for two-factor auth 2015-05-09 17:31:40 -04:00
Robert Speicher e512f770cd Fix Devise parameter sanitizer for otp_attempt 2015-05-09 17:31:40 -04:00
Robert Speicher 125ee5262a Don't use hard-coded sign_in path 2015-05-09 17:31:40 -04:00
Robert Speicher c84f1240d4 prepend_before_filter -> prepend_before_action 2015-05-09 17:31:40 -04:00
Robert Speicher bd680999f9 Be consistent with what we call the 2FA feature 
"Two-factor" vs. "2-Factor"
 2015-05-09 17:31:39 -04:00
Robert Speicher 35b62facac Update copy for recovery codes 2015-05-09 17:31:39 -04:00
Dmitriy ZaporozhetsandRobert Speicher 8ae712ae28 Render 2fa recovery codes instead of downloading it 2015-05-09 17:31:39 -04:00
Dmitriy ZaporozhetsandRobert Speicher 802fcd051f Add support for backup codes 2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher de9e1c3bad Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap users since it is not supported 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher 50a2a229e7 Fix rubocop complain 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher cde474a49f Make 2 factor authentication work 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher ba7e2fd946 Create Two-factor authentication resource for user 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher 7302395142 Init 2 factor authentication for user model 2015-05-09 17:31:07 -04:00
Douwe Maan 164d474488 Add Merge Request button to branches page. 2015-05-09 22:55:19 +02:00
Douwe Maan 722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02:00
Douwe Maan 8f75ab21d0 Link Commits tab to current branch from Compare page. 2015-05-09 22:25:52 +02:00
Maran a0fd2eb568 Don't show duplicate deploy keys. Fixes #1516 2015-05-08 21:32:03 +02:00
Dmitriy Zaporozhets 15bbb4ee1a Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch 
Fix Firefox problems when it wants to render issuable component
 2015-05-08 22:24:51 +03:00
Marin Jankovski 15909d6411 Move project visibility from clone bar to repository details block for non empty project. 2015-05-08 18:12:07 +02:00
Valeriy Sizov f682a6adb9 Merge pull request #9214 from Bugagazavr/hook-events 
Added X-GitLab-Event header for web hooks
 2015-05-08 17:17:01 +03:00
bugagazavr acac788902 Added X-GitLab-Event header for web hooks 2015-05-08 16:49:03 +03:00
Dmitriy Zaporozhets 09b3e354c8 Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-08 16:47:00 +03:00
Dmitriy Zaporozhets c3cf32e863 Merge branch 'version-check' into gl-version-check 
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
 2015-05-08 16:05:00 +03:00
Dmitriy Zaporozhets f38ce01bc3 Remove encryption 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-08 15:14:56 +03:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master' 
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
 2015-05-08 09:39:48 +00:00