Commit graph

7108 commits

Author SHA1 Message Date
Timo Võhmar
81f70c7d64
Merge pull request #873 from internetee/add-uuid-db-columns
Add UUID db columns
2018-06-21 15:22:11 +03:00
Timo Võhmar
d47cf36f8c
Merge pull request #891 from internetee/Changelog_update_180620
Changelog update 180620
2018-06-20 16:29:34 +03:00
Timo Võhmar
77ffc26585
Merge pull request #868 from internetee/rails5-api-controller-backport
Backport Rails 5 API controller
2018-06-20 16:27:24 +03:00
Timo Võhmar
53796d091a
Changelog update 180620 2018-06-20 16:13:10 +03:00
Artur Beljajev
d84d7cf772 Do not use bang version of methods 2018-06-20 15:17:27 +03:00
Artur Beljajev
1091fe7109 Change date format 2018-06-20 14:44:34 +03:00
Artur Beljajev
67a868b673 Merge branch 'replace-warden-helpers-with-devise' into registry-791 2018-06-20 12:34:31 +03:00
Artur Beljajev
f8290f90c5 Merge branch 'master' into registry-791 2018-06-20 12:34:26 +03:00
Artur Beljajev
eddf39ea9b Merge branch 'replace-warden-helpers-with-devise' into registry-790
# Conflicts:
#	test/integration/admin/domains_test.rb
2018-06-20 12:32:08 +03:00
Artur Beljajev
904975ad2d Update fixtures 2018-06-20 12:25:09 +03:00
Artur Beljajev
fa9731be16 Remove redirection 2018-06-20 12:21:44 +03:00
Artur Beljajev
9684c8e59f Refactor Devise integration
- Use scoped users
- Use the named route helpers instead of hardcoded paths
2018-06-20 12:21:22 +03:00
Artur Beljajev
c31f507c25 Specify Devise modules for each type of user 2018-06-19 22:20:52 +03:00
Artur Beljajev
02137b620e Remove routing specs 2018-06-19 21:10:53 +03:00
Artur Beljajev
450a95f628 Revert "Remove routing specs"
This reverts commit bb39d0340e.
2018-06-19 21:08:44 +03:00
Artur Beljajev
febbe1282d Fix links 2018-06-19 21:02:56 +03:00
Artur Beljajev
724d421f44 Remove Devise FailureApp 2018-06-19 20:50:02 +03:00
Artur Beljajev
28416a3375 Use singular controller 2018-06-19 20:43:23 +03:00
Artur Beljajev
756836001c Remove unused routes 2018-06-19 20:39:52 +03:00
Artur Beljajev
c538579d5b Remove rememberable and lockable modules from AdminUser 2018-06-19 20:36:06 +03:00
Artur Beljajev
bb39d0340e Remove routing specs 2018-06-19 20:24:52 +03:00
Artur Beljajev
ebe831e782 Regenerate and tune Devise config 2018-06-19 20:23:54 +03:00
Artur Beljajev
0f6df9e3f8 Regenerate Devise translation 2018-06-19 20:00:40 +03:00
Artur Beljajev
d064dbc11f Replace Warden test helpers with Devise ones 2018-06-19 19:40:35 +03:00
Artur Beljajev
e564b331ab Merge branch 'remove-dev-rake-task' into improve-registrant-area 2018-06-18 18:05:43 +03:00
Artur Beljajev
5cb6e765e3 Merge branch 'remove-dev-rake-task' into registry-790 2018-06-18 18:05:03 +03:00
Artur Beljajev
3b3c8e6a2d Revert "Update fixtures"
This reverts commit 76f8a46
2018-06-18 18:01:29 +03:00
Artur Beljajev
e418ec6825 Revert "Update fixture"
This reverts commit 81f923a
2018-06-18 18:01:14 +03:00
Artur Beljajev
20c99bd53a Revert "Pull up Devise module"
This reverts commit 58effbb
2018-06-18 17:44:36 +03:00
Artur Beljajev
3ef26082a8 Merge branch 'remove-dev-rake-task' into improve-registrant-area 2018-06-18 17:17:57 +03:00
Artur Beljajev
70cc25e3a8 Revert "Update CodeClimate config"
This reverts commit 3b996a5636.
2018-06-18 17:08:59 +03:00
Artur Beljajev
3b996a5636 Update CodeClimate config 2018-06-18 16:54:17 +03:00
Artur Beljajev
fabc4bc151 Merge branch 'master' into improve-code-climate 2018-06-18 16:47:37 +03:00
Artur Beljajev
58effbb7c3 Pull up Devise module 2018-06-18 16:46:49 +03:00
Artur Beljajev
8b2a3344be Merge branch 'master' into remove-dev-rake-task
# Conflicts:
#	lib/tasks/dev.rake
2018-06-18 16:31:01 +03:00
Artur Beljajev
31b3862fb9 Merge branch 'master' into remove-spring-gem
# Conflicts:
#	Gemfile.lock
2018-06-18 16:29:28 +03:00
Artur Beljajev
5b821f4074 Merge branch 'master' into registry-790
# Conflicts:
#	app/models/domain_cron.rb
#	lib/tasks/dev.rake
2018-06-18 16:27:56 +03:00
Artur Beljajev
4934a0c8e6 Remove unused method 2018-06-18 15:05:02 +03:00
Artur Beljajev
7ee0f18a46 Merge branch 'master' into improve-registrant-area 2018-06-18 14:58:15 +03:00
Artur Beljajev
80de7dd4ed Improve UI 2018-06-18 13:50:39 +03:00
Timo Võhmar
097f213717
Merge pull request #886 from internetee/registry-852-update-links
Registry 852 part 2
2018-06-18 13:45:53 +03:00
Artur Beljajev
457c142f61 Extract partial 2018-06-18 13:45:03 +03:00
Artur Beljajev
4e2d32a6ce Unify contact.auth_info look and feel 2018-06-18 13:30:57 +03:00
Artur Beljajev
8023742964 Use the named route helpers 2018-06-18 12:26:41 +03:00
Artur Beljajev
d403fdb5af Remove useless data from UI 2018-06-18 12:05:01 +03:00
Artur Beljajev
36b95973c8 Use standard datetime format 2018-06-18 12:03:59 +03:00
Maciej Szlosarczyk
7e88a96f27
Add missed travel_back callback in teardown 2018-06-18 10:34:24 +03:00
Maciej Szlosarczyk
4e181c51ca
Move from 2 to 4 spaces indentation in registrant/application.html.erb 2018-06-18 10:31:29 +03:00
Maciej Szlosarczyk
843dc8edcb
Add new links to registrant page layout 2018-06-18 10:30:23 +03:00
Artur Beljajev
7792a78f22 Improve readability 2018-06-18 01:25:18 +03:00