Commit graph

6830 commits

Author SHA1 Message Date
Artur Beljajev
48479dd70b Integrate master 2018-08-15 16:35:17 +03:00
Maciej Szlosarczyk
b8c082090e
Rename a variable from minimum_deposit to minimum_allowed_amount 2018-08-15 16:33:04 +03:00
Artur Beljajev
91b4f5a9dd Merge branch 'master' into refactor-devise-integration 2018-08-15 16:24:30 +03:00
Artur Beljajev
5a466206bf Add registrant area tests 2018-08-15 12:58:31 +03:00
Artur Beljajev
ca5edb16fa Refactor contact list 2018-08-15 12:56:56 +03:00
Maciej Szlosarczyk
4a6742692a
Fix issues raising from upgrade to Ruby 2.4 2018-08-15 12:47:27 +03:00
Maciej Szlosarczyk
0ea1045259
Fix rubocop issues 2018-08-15 12:46:36 +03:00
Maciej Szlosarczyk
b4b404888b
Disallow deposits that are lower than 0.01 EUR 2018-08-15 12:25:19 +03:00
Artur Beljajev
e334fd9bd0 Merge branch 'master' into improve-registrant-area 2018-08-14 21:35:31 +03:00
Timo Võhmar
646fb76007
Merge pull request #933 from internetee/update-registrant-API-documentation
Update Registrant API documentation
2018-08-14 16:45:35 +03:00
Timo Võhmar
b221169a78
Merge pull request #934 from internetee/remove-grape-vulnerability-CVE-2018-3769
Get rid of CVE-2018-3769 by updating Grape
2018-08-14 13:14:42 +03:00
Maciej Szlosarczyk
d4b0fecd40
Get rid of CVE-2018-3769 by updating Grape 2018-08-14 10:13:59 +03:00
Maciej Szlosarczyk
2f776f51ac
It seems like I made a mistake with the API URL prefix in docs
This should be fixed now. I decided on fixing the documentation
instead of the actual implementation, as it has no testing footprint
2018-08-14 09:02:25 +03:00
Artur Beljajev
a2d3377f5e Remove translation 2018-08-13 11:37:10 +03:00
Artur Beljajev
638167e3cb Improve registrant area 2018-08-11 18:10:08 +03:00
Artur Beljajev
60f451afcd Merge branch 'master' into refactor-devise-integration 2018-08-11 14:58:54 +03:00
Maciej Szlosarczyk
76ceefcf0b
Save 2 lines of code, lines of code are expensive 2018-08-10 15:28:00 +03:00
Maciej Szlosarczyk
a7a07ac93a
Insert whitespace for consistency, change save for save! 2018-08-10 15:25:28 +03:00
Maciej Szlosarczyk
322d931856
Further massage rubocop issues 2018-08-10 15:18:53 +03:00
Maciej Szlosarczyk
9d7dc59652
Fix rubocop issues and a stray typo spotted along the way 2018-08-10 14:43:06 +03:00
Maciej Szlosarczyk
647cb53404
Merge branch 'master' into registry-927 2018-08-10 14:30:38 +03:00
Timo Võhmar
43a70863cf
Merge pull request #917 from internetee/registry-902
Registrant portal API documentation
2018-08-10 14:27:08 +03:00
Timo Võhmar
90532761ce
Merge pull request #928 from internetee/registrant-api-contacts-controller
Registrant API contacts controller
2018-08-10 14:26:00 +03:00
Maciej Szlosarczyk
d26f073e1f
Revert indentation change 2018-08-10 14:22:50 +03:00
Maciej Szlosarczyk
0a0962e007
Write tests around API for domain lock 2018-08-10 14:18:24 +03:00
Artur Beljajev
77ee9db02d Use _path helper instead of _url 2018-08-10 13:52:46 +03:00
Artur Beljajev
ba24e42cec Remove useless spec 2018-08-10 13:52:13 +03:00
Artur Beljajev
48ad971af1 Add clarifying comment 2018-08-10 13:25:18 +03:00
Maciej Szlosarczyk
2a7caaa33e
Update routes 2018-08-10 13:21:44 +03:00
Maciej Szlosarczyk
194adec9d3
Foo 2018-08-10 13:17:08 +03:00
Artur Beljajev
7e9250deb6 Use scoped current user 2018-08-10 13:12:26 +03:00
Artur Beljajev
732997bf9e Merge branch 'registry-791' into registry-790
# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml
2018-08-09 16:42:43 +03:00
Maciej Szlosarczyk
c186929be4
Use single quote instead of double quotes 2018-08-09 15:28:43 +03:00
Maciej Szlosarczyk
256d2b7de4
Add test for error in business registry 2018-08-09 15:24:21 +03:00
Artur Beljajev
13f2bff8d0 Use setup callback 2018-08-09 15:05:28 +03:00
Maciej Szlosarczyk
4cc0669286
Add business registry support for contacts controller 2018-08-09 15:04:22 +03:00
Artur Beljajev
1d79f6548d Merge branch 'master' into registry-790
# Conflicts:
#	test/integration/epp/domain/domain_delete_test.rb
#	test/integration/epp/domain/domain_update_test.rb
#	test/integration/epp/domain/transfer/request_test.rb
#	test/system/admin_area/domains_test.rb
2018-08-09 15:01:23 +03:00
Artur Beljajev
dbace4cbc5 Merge branch 'master' into refactor-devise-integration 2018-08-09 14:51:22 +03:00
Artur Beljajev
0a5de433c2 Fix spec helpers 2018-08-09 14:48:16 +03:00
Artur Beljajev
1ff200576e Extract translations 2018-08-09 14:43:10 +03:00
Artur Beljajev
db0ae116a0 Use setup callback 2018-08-09 14:29:03 +03:00
Maciej Szlosarczyk
b18db19035
Fix error introduced by merge conflict 2018-08-09 14:07:06 +03:00
Maciej Szlosarczyk
9dd9d4b1d6
Merge branch 'master' into registrant-api-contacts-controller 2018-08-09 14:05:27 +03:00
Timo Võhmar
71c74a66f8
Merge pull request #926 from internetee/registry-922
Registrant API domain endpoint
2018-08-09 14:03:36 +03:00
Timo Võhmar
015e620260
Merge pull request #921 from internetee/registry-918
Registrant API authentication
2018-08-09 14:02:57 +03:00
Maciej Szlosarczyk
faeeb55bc7
Add badges to locked domains 2018-08-09 13:57:31 +03:00
Artur Beljajev
8c744f091b Remove unneeded attribute 2018-08-09 13:49:26 +03:00
Artur Beljajev
aa42220ca1 Customize login URLs for client certificate authentication
Certificate is now asked only when login form is submitted, not before
2018-08-09 13:46:27 +03:00
Artur Beljajev
1d95c1ccbc Use standard login form 2018-08-09 13:43:11 +03:00
Artur Beljajev
080defa228 Fix home page URL for anonymous users of registrar area 2018-08-09 13:39:48 +03:00