Commit graph

6208 commits

Author SHA1 Message Date
Artur Beljajev
22e1d09dfa Merge branch 'master' into registry-800
# Conflicts:
#	db/structure.sql
2018-04-17 15:09:47 +03:00
Artur Beljajev
e97c9d4b30 Merge branch 'master' into registry-800
# Conflicts:
#	db/structure.sql
2018-04-17 15:07:43 +03:00
Timo Võhmar
5ad935894e
Merge pull request #793 from internetee/registry-787
Remove Domain#valid_from
2018-04-17 14:02:42 +03:00
Artur Beljajev
4bae19b66d Merge branch 'master' into registry-662 2018-04-17 13:41:46 +03:00
Artur Beljajev
96e2136c38 Merge branch 'master' into registry-787
# Conflicts:
#	db/structure.sql
2018-04-17 12:38:55 +03:00
Timo Võhmar
34f6a77911
Merge pull request #797 from internetee/remove-unused-methods
Remove unused methods
2018-04-17 12:35:52 +03:00
Artur Beljajev
4f17e3f487 Update nokogiri gem 2018-04-16 10:55:45 +03:00
Artur Beljajev
4a64bead34 Fix domain deletion
#790
2018-04-15 23:52:54 +03:00
Artur Beljajev
9d6a5910e3 Merge branch 'master' into registry-790 2018-04-15 19:11:20 +03:00
Timo Võhmar
052f37fb86
Merge pull request #782 from internetee/remove-unused-cron-task
Remove unused CRON tasks
2018-04-13 18:15:03 +03:00
Artur Beljajev
b1209f7078 Merge branch 'master' into remove-unused-cron-task 2018-04-13 17:55:29 +03:00
Timo Võhmar
72c4fd6171
Merge pull request #822 from internetee/registry-231
Remove logging on activerecord validation
2018-04-13 17:20:34 +03:00
Timo Võhmar
3bc253fb6e
Merge pull request #821 from internetee/docker-test-and-dev-envs
Docker containers to run in development and test
2018-04-13 16:34:25 +03:00
Maciej Szlosarczyk
5ad5491fc1
Fix syntax error that came from merge 2018-04-13 15:50:51 +03:00
Maciej Szlosarczyk
359e444839
Config for test and development docker containers 2018-04-13 15:44:19 +03:00
Timo Võhmar
b02df5ef02
Merge pull request #775 from internetee/registry-623
Registry 623
2018-04-13 14:10:00 +03:00
Artur Beljajev
5061962c40 Fix test
#623
2018-04-12 18:01:30 +03:00
Artur Beljajev
963f6f87cf Use setup block instead of method in tests
#623
2018-04-12 17:31:04 +03:00
Artur Beljajev
a8046ce9cf Remove global setting for tests
#623
2018-04-12 17:27:39 +03:00
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
9bf1a7a06b Fix Rubocop offences
#790
2018-04-08 19:07:16 +03:00
Artur Beljajev
454ce4874b Remove useless comments
#790
2018-04-08 18:56:00 +03:00
Artur Beljajev
cc4a244844 Enable to keep a domain
#790
2018-04-08 18:52:32 +03:00
Artur Beljajev
90a4e11ce4 Improve readability
#790
2018-04-08 16:07:08 +03:00
Artur Beljajev
b4ed8f6c82 Remove double load
#790
2018-04-08 16:01:00 +03:00
Artur Beljajev
9e46222e6b Remove unused routes
#790
2018-04-08 15:54:42 +03:00
Artur Beljajev
4dc7723554 Remove dead code
#790
2018-04-08 15:53:29 +03:00
Artur Beljajev
a932d43dda Improve UI
#790
2018-04-08 15:45:01 +03:00
Artur Beljajev
e776d09f9d Improve domain discard
- Extract rake task domain:discard
- Remove background job when keeping a domain

#790
2018-04-08 00:38:42 +03:00
Artur Beljajev
00a30fc019 Remove unneeded attribute alias
#790
2018-04-07 16:21:07 +03:00
Artur Beljajev
9059779ece Remove unused CRON tasks 2018-04-07 15:40:45 +03:00
Artur Beljajev
2e9acedc90 Improve test name
#790
2018-04-07 15:18:10 +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