Commit graph

7108 commits

Author SHA1 Message Date
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
Artur Beljajev
0d770137b6 Convert HAML to ERB 2018-08-08 22:47:51 +03:00
Artur Beljajev
096035ae11 Revert old behaviour 2018-08-08 22:28:09 +03:00
Artur Beljajev
6de31605d9 Integrate master branch 2018-08-08 19:36:14 +03:00
Timo Võhmar
143fe2f585
Merge pull request #930 from internetee/improve-contact-tests
Add contact tests
2018-08-08 16:03:58 +03:00
Timo Võhmar
d21422325a
Merge pull request #925 from internetee/remove-dead-code
Remove dead code
2018-08-08 16:00:17 +03:00
Maciej Szlosarczyk
7ce092dff2
Add final assertion
To make sure that the domain is in the right state after out-of-order
execution of the lock removal
2018-08-08 15:49:37 +03:00
Maciej Szlosarczyk
611e568488
Merge branch 'registry-918' into registry-927 2018-08-08 15:45:05 +03:00
Maciej Szlosarczyk
dffe865d89
Add ability for admin to remove registry lock 2018-08-08 15:43:29 +03:00
Artur Beljajev
bf3b54367b Merge branch 'master' into refactor-devise-integration 2018-08-08 14:13:53 +03:00
Artur Beljajev
9225d30914 Remove dead code 2018-08-08 13:56:14 +03:00
Artur Beljajev
3fc55866b2 Use setup callback 2018-08-08 13:55:54 +03:00
Artur Beljajev
4ad02ddc34 Merge branch 'master' into improve-contact-tests 2018-08-08 13:54:48 +03:00
Maciej Szlosarczyk
4743b1e2a5
Add locked_by_registrant_at field to domain 2018-08-08 13:37:40 +03:00
Maciej Szlosarczyk
544c8565c5
Merge branch 'master' into registry-927 2018-08-08 09:40:57 +03:00
Maciej Szlosarczyk
961c57563f
Merge branch 'registry-918' into registry-922 2018-08-08 09:15:40 +03:00
Maciej Szlosarczyk
06dc954167
Make tests inherit from ApplicationIntegrationTest class 2018-08-08 09:15:18 +03:00
Maciej Szlosarczyk
8736366a41
Merge branch 'registry-918' into registrant-api-contacts-controller 2018-08-08 09:14:11 +03:00
Maciej Szlosarczyk
e1881685b7
Make tests inherit from ApplicationIntegrationTest class 2018-08-08 09:13:46 +03:00
Maciej Szlosarczyk
133a11977e
Merge branch 'master' into registry-918 2018-08-08 09:06:32 +03:00
Artur Beljajev
f73a2551d3 Improve readability 2018-08-07 22:53:02 +03:00
Timo Võhmar
9282da18f3
Merge pull request #924 from internetee/inherit-from-integration-test
Change test structure to follow closer Rails 5 rules
2018-08-07 17:29:36 +03:00
Artur Beljajev
738785fcb9 Add contact tests 2018-08-07 16:41:11 +03:00