Commit graph

5237 commits

Author SHA1 Message Date
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
e14bac337e Merge remote-tracking branch 'origin/registry-515' into registry-475 2017-05-26 09:00:14 +03:00
Artur Beljajev
864631dba7 Merge branch 'rspec' into registry-475 2017-05-26 08:58:13 +03:00
Artur Beljajev
9c8ac57904 Merge branch 'master' into registry-475 2017-05-26 08:56:09 +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
73bd146816 Disable partial double verification in views
#480
2017-05-25 23:38:17 +03:00
Artur Beljajev
9486138e5e Merge branch 'rspec' into registry-480
# Conflicts:
#	spec/views/mailers/shared/registrant/registrant_shared.rb
2017-05-25 23:36:40 +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
8bcd0614ee Merge branch 'master' into remove-robot-bin
# Conflicts:
#	bin/robot
2017-05-25 19:31:56 +03:00
Artur Beljajev
c507082c1f Merge branch 'master' into update-nokogiri-gem 2017-05-25 19:31:02 +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
0ef06fbdb8 Merge branch 'registry-508' into update-nokogiri-gem 2017-05-24 12:27:00 +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
d934d5c1fd Remove unicorn gem config
Addition to #603edfce79
2017-05-23 15:40:53 +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
da53c70182 Merge branch 'registry-508' into registry-480 2017-05-22 23:20:49 +03:00
Artur Beljajev
466d864270 Merge branch 'registry-516' into registry-480 2017-05-22 23:20:43 +03:00
Artur Beljajev
e6baf32c4d Merge branch 'rspec' into registry-480 2017-05-22 15:27:41 +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
094b2613dd Update nokogiri gem to 1.7.2 2017-05-22 14:32:15 +03:00
Artur Beljajev
92c0fdba94 Remove guard gems as unused 2017-05-22 14:13:36 +03:00
Artur Beljajev
adcebd084a Show registrant phone in ContactMailer
#480
2017-05-22 12:42:10 +03:00
Artur Beljajev
490ebf969c Take "address_processing" setting into account in ContactMailer
#480
2017-05-22 01:27:17 +03:00
Artur Beljajev
332ef9b04b Merge branch 'rspec' into registry-480 2017-05-20 17:40:24 +03:00
Artur Beljajev
afe5a08472 Include translation helpers in mailer specs 2017-05-20 17:40:14 +03:00
Artur Beljajev
876c010435 Refactor registrant change mailer
#480
2017-05-20 17:36:32 +03:00
Artur Beljajev
bfc0c0b74f Improve RegistrantChangeMailer
- Do not show registrant address unless "address_processing" is enabled
- Add missing registrant state and zip attributes

#480
2017-05-18 15:59:06 +03:00
Artur Beljajev
2c648ddc84 Merge branch 'registry-515' into registry-480 2017-05-15 15:56:05 +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