Artur Beljajev
db0384a58a
Improve UI
...
#509
2017-11-22 03:04:06 +02:00
Artur Beljajev
ac4a7bd769
Convert HAML to ERB
...
#509
2017-11-22 03:03:06 +02:00
Artur Beljajev
de23a7bdb4
Merge branch 'registry-343' into refactor-admin-registrars
2017-11-22 03:02:37 +02:00
Artur Beljajev
beee0e570a
Merge branch 'registry-407' into refactor-admin-registrars
2017-11-22 03:02:33 +02:00
Artur Beljajev
978aae04aa
Merge branch 'registry-407' into registry-640
2017-11-22 02:52:21 +02:00
Artur Beljajev
9eacfaddcc
Merge branch 'minitest-config' into registry-343
2017-11-22 02:35:22 +02:00
Artur Beljajev
f14b93ae12
Merge branch 'master' into minitest-config
...
# Conflicts:
# Gemfile
# spec/models/contact_spec.rb
2017-11-22 01:06:27 +02:00
Artur Beljajev
4b172e9acf
Improve UI
...
#407
2017-11-21 23:53:55 +02:00
Artur Beljajev
e856e4c055
Improve form validation UI
...
#407
2017-11-21 23:50:21 +02:00
Artur Beljajev
1fa249bbe5
Remove monkey patching
...
#407
2017-11-21 23:48:58 +02:00
Georg
3abc3f89b3
remove unneeded fields from registrant portal ( #649 )
...
#648
2017-11-21 14:51:16 +02:00
Artur Beljajev
2da578a437
Migrate fabricators to factory bot factories ( #626 )
...
* Remove factory_girl include from dev rake task
No longer needed after 92b125b4a7https://robots.thoughtbot.com/factory_bot
2017-11-16 10:18:53 +02:00
Artur Beljajev
411af16f9c
Merge branch 'migrate-fabricators-to-factory-bot-factories' into registry-343
2017-11-15 15:46:54 +02:00
Artur Beljajev
be959a8471
Merge branch 'master' into migrate-fabricators-to-factory-bot-factories
...
# Conflicts:
# Gemfile
# lib/tasks/dev.rake
# spec/models/contact_spec.rb
2017-11-15 15:42:54 +02:00
Timo Võhmar
acfe0552fc
Merge pull request #638 from internetee/registry-609-master
...
Registry 609 to master
2017-11-15 12:13:19 +02:00
Timo Võhmar
263052d0a0
Merge pull request #376 from internetee/delete-unneeded-rake-task
...
Delete unneeded rake task
2017-11-15 12:11:10 +02:00
Timo Võhmar
2bd431d901
Merge pull request #614 from internetee/remove-gitlab-docker-remnants
...
Remove gitlab docker remnants
2017-11-15 11:57:26 +02:00
Timo Võhmar
c1a757d7fb
Merge pull request #615 from internetee/clarify-gem-usage
...
Clarify gem usage
2017-11-15 11:56:24 +02:00
Timo Võhmar
20aec0f0f5
Merge pull request #632 from internetee/update-code-climate-rubocop-version
...
Update Code Climate Rubocop version
2017-11-15 11:50:34 +02:00
Timo Võhmar
0f11c2b0fd
Merge branch 'master' into update-code-climate-rubocop-version
2017-11-15 11:50:17 +02:00
Timo Võhmar
047f02bfb1
Merge pull request #628 from internetee/remove-unneeded-dev-gems
...
Remove unneeded dev gems
2017-11-15 11:37:20 +02:00
Timo Võhmar
258323ba0d
Merge pull request #630 from internetee/do-not-load-factories-in-dev-rake
...
Do not load FactoryGirl factories in dev.rake
2017-11-15 11:31:48 +02:00
Timo Võhmar
ca13c08ea8
Merge pull request #620 from internetee/revert-551d1799d1782a9dbf5edfb57a0fa4c5fe6bef83
...
Revert "Revert "Registry 569""
2017-11-15 11:27:04 +02:00
Georg Kahest
f1739f2202
fix typo
2017-11-14 12:58:22 +02:00
Georg Kahest
abeeec3baf
prefer each over for
2017-11-14 12:51:44 +02:00
Georg Kahest
e62bb19a7e
fix indention
2017-11-14 12:32:33 +02:00
Georg Kahest
3f1c36bd9a
fix some of the style bugs
2017-11-13 18:43:37 +02:00
Georg Kahest
af31230285
fix rspec for mid without ip whitelist
2017-11-13 18:21:39 +02:00
Georg Kahest
06049cd22f
while logging in with id/mid pick only users who have whitelisted ip
2017-11-13 18:21:27 +02:00
Artur Beljajev
b6bb80f2aa
Revert "Remove invoice_item factory"
...
This reverts commit d5c0792
2017-11-13 05:58:17 +02:00
Artur Beljajev
d5c0792d91
Remove invoice_item factory
2017-11-13 05:57:06 +02:00
Artur Beljajev
3a85147887
Revert fixtures from #509
2017-11-13 05:30:13 +02:00
Artur Beljajev
8237bcceb0
Merge branch 'master' into minitest-config
...
# Conflicts:
# lib/tasks/dev.rake
2017-11-12 22:35:38 +02:00
Artur Beljajev
c8e36867d4
Merge branch 'do-not-load-factories-in-dev-rake' into minitest-config
...
# Conflicts:
# lib/tasks/dev.rake
2017-11-12 00:59:43 +02:00
Artur Beljajev
f36226ae1e
Update fixtures
2017-11-12 00:55:50 +02:00
Artur Beljajev
2f2ce97a76
Include minitest/mock in test helper
2017-11-12 00:54:51 +02:00
Artur Beljajev
776a059b58
Check pending migrations in test env
2017-11-09 15:24:25 +02:00
Artur Beljajev
6cd7a685f9
Add fixtures
2017-11-09 15:24:04 +02:00
Artur Beljajev
1c6d47380f
Registry 633 ( #635 )
...
* Allow session cookie "secure" and "same_site" flag configuration #633
2017-11-09 13:58:24 +02:00
Artur Beljajev
88ac207913
Include AbstractController::Translation in IntegrationTest
2017-11-03 09:55:59 +02:00
Artur Beljajev
72da42797c
Merge branch 'minitest-config' into registry-343
2017-11-01 15:59:33 +02:00
Artur Beljajev
3785f23da0
Rename FactoryGirl to FactoryBot
...
https://robots.thoughtbot.com/factory_bot
2017-11-01 15:58:49 +02:00
Artur Beljajev
f141fa4e89
Merge branch 'migrate-fabricators-to-factory-bot-factories' into minitest-config
2017-11-01 15:58:20 +02:00
Artur Beljajev
e658a7b094
Revert "Rename FactoryGirl to FactoryBot"
...
This reverts commit f68cf8a
2017-11-01 15:57:13 +02:00
Artur Beljajev
648bd392d6
Update Code Climate Rubocop version
2017-11-01 09:49:09 +02:00
Artur Beljajev
50f4521bdf
Merge branch 'minitest-config' into registry-343
2017-10-30 10:44:08 +02:00
Artur Beljajev
21f8e15f65
Disable unit test generation
...
g.test_framework = :testunit (or test_unit) does not work
out of the box.
https://stackoverflow.com/questions/12148611/rails-generators-not-
generating-the-proper-test-templates
2017-10-30 10:43:51 +02:00
Artur Beljajev
925bec2b34
Remove launchy gem
2017-10-29 11:48:40 +02:00
Artur Beljajev
e640a2c07c
Remove phantomjs-binaries gem
2017-10-29 11:48:15 +02:00
Artur Beljajev
ba8e758979
Remove phantomjs gem.
...
Motivation:
- PhantomJS can be installed manually
- gem has never been released (alpha version was used)
2017-10-29 11:47:16 +02:00
