home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 b66be0a2b3 Use non-broken version of attr_encrypted 2015-05-09 17:31:11 -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
Dmitriy ZaporozhetsandRobert Speicher fe75411df8 Add 2 factor authentication gems 2015-05-09 17:30:50 -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
Dmitriy Zaporozhets 40c8295a24 Merge branch 'rs-disallow-id-class' into 'master' 
Remove class and id attributes from SanitizationFilter whitelist

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

See merge request !631
 2015-05-09 06:08:42 +00: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
Dmitriy Zaporozhets 5af7d789f5 Merge branch 'show_project_visibility' into 'master' 
Move project visibility from clone bar to repository details block for non empty project.

See merge request !1818
 2015-05-08 18:20:53 +00:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -04: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
Marin Jankovski d9b6b9201e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-08 17:07:37 +02:00
Job van der Voort 1c911b430c Merge branch 'How_to_Reset_your_root_password' into 'master' 
How to reset your root password

Added link and file correctly on Security doc.

Please review to make sure it's correct.

See merge request !1811
 2015-05-08 14:36:50 +00:00
Job van der Voort c74a0be9f8 make it more obvious what happens in the code 2015-05-08 14:36:24 +00:00
Job van der Voort 83c5aa6888 remove redundant colon 2015-05-08 14:35:05 +00: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
Valery Sizov a1399c3c30 Merge branch 'quote_string' into 'master' 
Adding quote_string to migration

See merge request !630
 2015-05-08 14:09:51 +00:00
Valery Sizov 3bc717f010 Adding quote_string to migration 2015-05-08 16:54:45 +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 edf0a0715b Remove unnecessary public key 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-08 15:59:34 +03:00
Martin Luder 55f91f3d43 Order commit comments in API chronologically 
When fetching commit comments via API, the comments were not ordered,
but just returned in the order Postgresql finds them. Now the API always
returns comments in chronological order.
 2015-05-08 14:34:10 +02:00
Valery Sizov 851cfc50ea Merge branch 'fix_link_in_doc' into 'master' 
Fix link to the CI documentation

See merge request !627
 2015-05-08 12:22:48 +00:00
Valery Sizov 3a18eb8d3a Fix link to the CI documentation 2015-05-08 15:22:19 +03:00
Sytse Sijbrandij 8a413174a5 Merge branch 'backup_doc' into 'master' 
Improved the backup documentation

See merge request !621
 2015-05-08 12:16:08 +00:00
Dmitriy Zaporozhets f38ce01bc3 Remove encryption 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-08 15:14:56 +03:00