Commit graph

5096 commits

Author SHA1 Message Date
Artur Beljajev
f76e1259fc Consider nil in price expire time as effective
#522
2017-06-03 23:12:16 +03:00
Artur Beljajev
8916eee169 Merge branch 'master' into registry-522 2017-06-02 15:25:26 +03:00
Timo Võhmar
589afdbe07 Merge pull request #537 from internetee/registry-512
Registry 512
2017-06-01 16:08:02 +03:00
Artur Beljajev
f9bb20751c Merge branch 'master' into registry-512 2017-05-31 19:48:26 +03:00
Artur Beljajev
8455f69dbc Replace SERVER_DELETE_PROHIBITED with PENDING_UPDATE on EPP domain:update
#512
2017-05-31 19:48:16 +03:00
Artur Beljajev
e257737e1c Merge branch 'rspec' into registry-522 2017-05-26 08:51:04 +03:00
Artur Beljajev
433f14dd1c Update database_cleaner gem 2017-05-26 08:42:59 +03:00
Artur Beljajev
bfb3b43cda Update webmock gem 2017-05-26 08:42:15 +03:00
Artur Beljajev
1d72dc92e9 Merge branch 'rspec' into registry-522 2017-05-25 19:42:34 +03:00
Artur Beljajev
39dc1886c8 Merge branch 'master' into rspec
# Conflicts:
#	Gemfile.lock
2017-05-25 19:41:32 +03:00
Artur Beljajev
58ae53b1e6 Add price expiration
#522
2017-05-25 19:17:11 +03:00
Artur Beljajev
3741e2d2a3 Merge branch 'ui' into registry-522 2017-05-25 19:02:20 +03:00
Artur Beljajev
aba53b8108 Change default date format 2017-05-25 19:01:47 +03:00
Georg
97fb6db29f Merge pull request #518 from internetee/add-puma-config
Add puma config
2017-05-24 15:45:15 +03:00
Georg
7c81715784 Merge pull request #513 from internetee/test-travis-bundler-cache
Test Travis bundler cache
2017-05-24 15:40:34 +03:00
Georg
7659d4642d Merge pull request #493 from internetee/remove-rubycritic-gem
Remove rubycritic gem
2017-05-24 15:33:10 +03:00
Georg
b9bb0c0dad Merge pull request #530 from internetee/update-mail-gem
Update mail gem to 2.6.5
2017-05-24 14:02:53 +03:00
Artur Beljajev
67b1e9a2d5 Fix price edit view
#522
2017-05-23 21:27:57 +03:00
Artur Beljajev
7d94273a5e Do not allow to permanently remove a price
#522
2017-05-23 17:31:32 +03:00
Artur Beljajev
18be71b519 Merge branch 'rspec' into registry-522 2017-05-23 17:24:54 +03:00
Artur Beljajev
35267820f9 Do not allow to permanently remove a zone
#522
2017-05-23 17:23:05 +03:00
Artur Beljajev
6cacf59467 Use without_partial_double_verification instead verify_partial_doubles = false 2017-05-23 15:36:28 +03:00
Artur Beljajev
6cda021d71 Remove active job rspec matcher
It is built-in in latest rspec
2017-05-23 15:03:14 +03:00
Artur Beljajev
64f6e07a20 Merge branch 'registry-508' into registry-522 2017-05-23 11:05:48 +03:00
Artur Beljajev
53931d1486 Merge branch 'registry-515' into registry-522 2017-05-23 11:05:42 +03:00
Artur Beljajev
01591ff18e Update mail gem to 2.6.5 2017-05-22 15:20:24 +03:00
Artur Beljajev
e76ee8baab Update rspec gem to 3.6.0 2017-05-22 14:39:20 +03:00
Artur Beljajev
92c0fdba94 Remove guard gems as unused 2017-05-22 14:13:36 +03:00
Artur Beljajev
afe5a08472 Include translation helpers in mailer specs 2017-05-20 17:40:14 +03:00
Artur Beljajev
48ae54d507 Improve rake:bootstrap task
#515
2017-05-15 11:48:16 +03:00
Artur Beljajev
0fb8e2bde1 Remove secrets-related code
#508
2017-05-15 01:49:42 +03:00
Artur Beljajev
c1a29ea7b5 Add dev:prime rake task
#515
2017-05-15 01:43:20 +03:00
Artur Beljajev
76cf65c6c4 Merge branch 'rspec' into registry-515 2017-05-15 00:27:57 +03:00
Artur Beljajev
7d7fa65947 Revert "Include "factory_girl_rails" gem in development"
This reverts commit b15e36ea08.
2017-05-15 00:27:39 +03:00
Artur Beljajev
2d3e2f70fb Merge branch 'rspec' into registry-515 2017-05-14 19:37:59 +03:00
Artur Beljajev
ca6105a919 Move initial setup from seeds.rb to bootstrap rake task
#515
2017-05-14 19:29:58 +03:00
Artur Beljajev
924e6c037a Add puma config 2017-05-14 18:37:55 +03:00
Artur Beljajev
4d3d783cd6 Merge branch 'rspec' into registry-516 2017-05-12 13:46:42 +03:00
Artur Beljajev
5c65aa5f2b Remove secrets from Travis config
#508
2017-05-12 09:45:23 +03:00
Artur Beljajev
33a54a7bda Improve "admin_user" factory 2017-05-11 19:05:58 +03:00
Artur Beljajev
b15e36ea08 Include "factory_girl_rails" gem in development 2017-05-11 18:32:12 +03:00
Artur Beljajev
a696bac3ba Remove unused secrets sample
#508
2017-05-11 18:16:50 +03:00
Artur Beljajev
e3faac3d44 Set "secret_key_base" config key from Figaro
#508
2017-05-11 18:16:14 +03:00
Timo Võhmar
b478712f7c Merge pull request #504 from internetee/registry-503
Improve db setup
2017-05-10 12:23:50 +03:00
Artur Beljajev
38af76f3fb Test Travis bundler cache 2017-05-09 20:35:52 +03:00
Artur Beljajev
3954a7c074 Fix deprecation warning
#503
2017-05-05 11:52:28 +03:00
Artur Beljajev
27ee3b2be8 Improve db setup
#503
2017-05-04 14:05:35 +03:00
Timo Võhmar
7e8c4077a6 Update CHANGELOG.md 2017-05-02 16:46:54 +03:00
Timo Võhmar
070eeb246c Update CHANGELOG.md 2017-05-02 16:45:54 +03:00
Timo Võhmar
504e8777e0 Merge pull request #497 from internetee/registry-495
Registry 495
2017-05-02 14:35:55 +03:00