Commit graph

6178 commits

Author SHA1 Message Date
Artur Beljajev
7ffc62e370 Merge branch 'master' into registry-623
# Conflicts:
#	test/integration/admin/registrars/show_registrar_test.rb
2018-04-12 17:16:58 +03:00
Artur Beljajev
bee233e00b Fix incorrect method
#623
2018-04-12 12:06:42 +03:00
Timo Võhmar
9d128d0914
Merge pull request #818 from internetee/small-fix-for-l18n
Fix missing translation error in Mail templates page
2018-04-11 15:50:15 +03:00
Timo Võhmar
df741f133f
Merge pull request #809 from internetee/tune-test-env
Tune test env
2018-04-11 15:49:29 +03:00
Maciej Szlosarczyk
18ad5e8e5e
Fix missing translation error 2018-04-11 12:38:10 +03:00
Artur Beljajev
ce3b04bff0 Do not show discarded domain details in WHOIS
#789
2018-04-09 00:42:22 +03:00
Artur Beljajev
9059779ece Remove unused CRON tasks 2018-04-07 15:40:45 +03:00
Artur Beljajev
77135b34ba Merge branch 'tune-test-env' into registry-662
# Conflicts:
#	test/integration/registrar/bulk_change/nameserver_test.rb
#	test/integration/registrar/domain_transfers_test.rb
2018-04-06 00:44:24 +03:00
Artur Beljajev
228078a84e Add bulk replace to registrar area
#662
2018-04-06 00:16:17 +03:00
Artur Beljajev
8b8b8df394 Reset WebMock after integration tests 2018-04-05 16:06:10 +03:00
Artur Beljajev
5c34d9f468 Merge branch 'master' into registry-623 2018-04-04 16:32:17 +03:00
Artur Beljajev
ae4cae16d2 Merge branch 'tune-test-env' into registry-792 2018-04-04 15:37:26 +03:00
Artur Beljajev
2908fd512f Reset setting after each test 2018-04-04 15:26:51 +03:00
Artur Beljajev
c2aa9a815e Use setup/teardown blocks instead of methods
#792
2018-04-04 13:31:40 +03:00
Artur Beljajev
ea85731050 Merge branch 'tune-test-env' into registry-792 2018-04-04 13:30:40 +03:00
Artur Beljajev
1279df00ef Merge branch 'master' into registry-792 2018-04-04 13:30:35 +03:00
Artur Beljajev
817a672143 Reset time after each test 2018-04-04 01:43:40 +03:00
Artur Beljajev
f8eda810f9 Use setup/teardown blocks instead of methods 2018-04-04 01:42:59 +03:00
Artur Beljajev
b1e0371188 Run tests in random order 2018-04-04 01:41:40 +03:00
Timo Võhmar
f7c2b25a66
Merge pull request #807 from internetee/Changelog_update_180403
Update CHANGELOG.md
2018-04-03 19:10:20 +03:00
Timo Võhmar
efda76a195
Update CHANGELOG.md
spelling corrections
2018-04-03 19:08:32 +03:00
Artur Beljajev
af414c9267 Reorganize tests
#792
2018-04-03 18:01:56 +03:00
Artur Beljajev
f269796382 Show label in UI if a domain is discarded
#792
2018-04-03 15:22:20 +03:00
Artur Beljajev
1dcf7bcd62 Remove unused partial
#792
2018-04-03 00:30:49 +03:00
Artur Beljajev
4435183a0e Clean up
#792
2018-04-03 00:17:27 +03:00
Artur Beljajev
639021d262 Reformat
#792
2018-04-03 00:15:29 +03:00
Artur Beljajev
f35f204594 Extract translation
#792
2018-04-03 00:15:00 +03:00
Artur Beljajev
74b681db07 Improve UI
#792
2018-04-03 00:12:17 +03:00
Artur Beljajev
593c546c30 Convert HAML to ERB 2018-04-03 00:06:35 +03:00
Artur Beljajev
46b94a3d8b Merge branch 'master' into registry-792 2018-04-02 23:22:16 +03:00
Timo Võhmar
adf0eb3307
Merge pull request #804 from internetee/Changelog_update_180403
Changelog update 180403
2018-04-02 20:57:37 +03:00
Timo Võhmar
d766e2d82c
Changelog update 180403 2018-04-02 20:53:53 +03:00
Artur Beljajev
d57c737a80 Convert specs to tests
#792
2018-04-02 09:13:53 +03:00
Timo Võhmar
7cca7b2976
Merge pull request #798 from internetee/registry-678
Registry 678
2018-04-02 00:49:05 +03:00
Artur Beljajev
7155d08f6e Fix test 2018-04-01 23:03:52 +03:00
Artur Beljajev
29a8f39cb6 Prohibit renewing an invalid domain
#678
2018-04-01 22:59:19 +03:00
Artur Beljajev
139b7f290d Update fixtures 2018-04-01 22:42:49 +03:00
Artur Beljajev
5cc16552ab Backport Rails 5 test assertions
#799
2018-04-01 22:41:48 +03:00
Artur Beljajev
b694f0c2f6 Remove unused methods 2018-04-01 18:42:34 +03:00
Artur Beljajev
c675512b22 Change domains.valid_to DB column to NOT NULL
#800
2018-03-31 23:31:40 +03:00
Artur Beljajev
77104582f7 Fix attribute name 2018-03-31 12:55:08 +03:00
Artur Beljajev
157bf228b0 Merge branch 'reformat-structure.sql' into registry-787 2018-03-31 12:53:15 +03:00
Artur Beljajev
c2458c7ad4 Merge branch 'master' into registry-787
# Conflicts:
#	db/structure.sql
2018-03-31 12:53:07 +03:00
Artur Beljajev
a7b89797c2 Merge branch 'reformat-structure.sql' into registry-623 2018-03-31 11:33:44 +03:00
Artur Beljajev
5ef56e13e0 Reformat structure.sql 2018-03-31 11:33:19 +03:00
Artur Beljajev
49757f183c Merge branch 'master' into registry-623 2018-03-31 11:23:27 +03:00
Timo Võhmar
5b0032cd30
Merge pull request #796 from internetee/fix-structure-sql
Fix structure.sql
2018-03-29 17:24:58 +03:00
Artur Beljajev
8124023809 Fix structure.sql 2018-03-29 12:23:32 +03:00
Artur Beljajev
837f326ef6 Merge branch 'master' into registry-623
# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb
2018-03-29 12:13:59 +03:00
Timo Võhmar
d501ee90e0
Merge pull request #761 from internetee/registry-642
Do not check IP in bank link callback URL
2018-03-28 13:17:29 +03:00