Artur Beljajev
|
f299241b28
|
Merge branch 'master' into registry-791
# Conflicts:
# db/structure.sql
|
2018-06-21 17:38:38 +03:00 |
|
Timo Võhmar
|
969a885ae4
|
Merge pull request #872 from internetee/remove-dev-rake-task
Remove `dev` rake task
|
2018-06-21 16:18:04 +03:00 |
|
Timo Võhmar
|
9a49e87972
|
Merge pull request #854 from internetee/improve-code-climate
Improve CodeClimate config
|
2018-06-21 16:16:56 +03:00 |
|
Timo Võhmar
|
549852048e
|
Merge pull request #856 from internetee/remove-spring-gem
Remove "spring" gem
|
2018-06-21 16:15:56 +03:00 |
|
Timo Võhmar
|
db34bcb1e4
|
Merge pull request #881 from internetee/move-docker-config
Move docker configuration to https://github.com/internetee/docker-images
|
2018-06-21 16:03:39 +03:00 |
|
Timo Võhmar
|
8c7b2e0a79
|
Merge pull request #877 from internetee/fix-country-dropdown
Fix country drop-down UI
|
2018-06-21 15:51:44 +03:00 |
|
Timo Võhmar
|
a1522ff770
|
Merge pull request #876 from internetee/remove-code-climate-badge
Remove code climate issue count badge
|
2018-06-21 15:48:39 +03:00 |
|
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
|
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
|
d064dbc11f
|
Replace Warden test helpers with Devise ones
|
2018-06-19 19:40:35 +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
|
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 |
|
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 |
|
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
|
cd6a40b1bb
|
Fix test
|
2018-06-15 17:10:06 +03:00 |
|
Artur Beljajev
|
96b02ed8d5
|
Merge remote-tracking branch 'origin/registry-791' into registry-791
|
2018-06-15 16:56:27 +03:00 |
|
Artur Beljajev
|
255b0db9cb
|
Merge branch 'master' into registry-791
|
2018-06-15 16:55:58 +03:00 |
|
Timo Võhmar
|
969eb7378d
|
Merge pull request #879 from internetee/registry-844
Do not send `TotalVAT` and `VATCode` params to Directo
|
2018-06-15 16:51:54 +03:00 |
|
Maciej Szlosarczyk
|
afa275c805
|
Move docker configuration to https://github.com/internetee/docker-images
|
2018-06-15 11:02:27 +03:00 |
|
Artur Beljajev
|
ccf1ea198c
|
Do not send TotalVAT and VATCode params to Directo
Partly reverts 169c67839e
|
2018-06-15 08:42:32 +03:00 |
|
Timo Võhmar
|
5a0d191b7e
|
Merge pull request #869 from internetee/remove-monkey-patch
Remove monkey patch
|
2018-06-14 19:23:06 +03:00 |
|
Timo Võhmar
|
fcefd14602
|
Merge pull request #864 from internetee/add-uglifier-gem
Add "uglifier" gem for es6 compression
|
2018-06-14 17:59:59 +03:00 |
|
Artur Beljajev
|
a07a458745
|
Merge branch 'master' into remove-spring-gem
# Conflicts:
# Gemfile
|
2018-06-14 13:44:48 +03:00 |
|
Artur Beljajev
|
435147ca46
|
Fix country drop-down UI
|
2018-06-14 13:42:23 +03:00 |
|
Timo Võhmar
|
d7fe0a2e2b
|
Merge pull request #867 from internetee/copy-puma-config-from-rails5
Copy "puma" gem config from Rails 5
|
2018-06-14 13:37:01 +03:00 |
|
Timo Võhmar
|
01bcedec49
|
Merge pull request #863 from internetee/test-locally-failing-test
Improve setup of a locally failing test
|
2018-06-14 13:36:13 +03:00 |
|
Timo Võhmar
|
8ec6b80794
|
Merge pull request #857 from internetee/remove-rubocop-gem
Remove "rubocop" gem
|
2018-06-14 13:35:25 +03:00 |
|
Timo Võhmar
|
fd215bfbbb
|
Merge pull request #866 from internetee/remove-unneeded-file
Remove unneded .agignore
|
2018-06-14 13:34:52 +03:00 |
|
Timo Võhmar
|
d8778a4af6
|
Merge pull request #865 from internetee/fix-translations
Fix translations
|
2018-06-14 13:34:03 +03:00 |
|
Artur Beljajev
|
78d7d5d894
|
Merge branch 'master' into remove-spring-gem
# Conflicts:
# config/environments/test.rb
|
2018-06-14 13:33:14 +03:00 |
|
Timo Võhmar
|
2828f8ca72
|
Merge pull request #859 from internetee/remove-lib-from-autoload-path
Remove `lib` folder from autoload path
|
2018-06-14 13:20:22 +03:00 |
|
Timo Võhmar
|
70205c9748
|
Merge pull request #860 from internetee/improve-test-env-config
Improve test env config
|
2018-06-14 13:04:34 +03:00 |
|
Maciej Szlosarczyk
|
2f44dac144
|
Remove code climate issue count badge
|
2018-06-14 09:52:04 +03:00 |
|
Artur Beljajev
|
bf53ca5947
|
Nullify contact's uuid when transferring
It will be generated on DB level
|
2018-06-13 10:35:18 +03:00 |
|
Artur Beljajev
|
fc3c70c5ee
|
Add clarifying comment
|
2018-06-13 08:08:14 +03:00 |
|
Artur Beljajev
|
183eca884e
|
Add contacts.uuid and domains.uuid uniq constraints
|
2018-06-13 08:03:19 +03:00 |
|
Artur Beljajev
|
5626c87e04
|
Change contacts.uuid and domains.uuid to NOT NULL
|
2018-06-13 07:27:29 +03:00 |
|