Commit graph

6833 commits

Author SHA1 Message Date
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
3d9ee8a611 Merge branch 'add-uuid-db-columns' into registry-849 2018-06-13 10:44:37 +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
c170ec612f Merge branch 'add-uuid-db-columns' into registry-849 2018-06-13 07:43:28 +03:00
Artur Beljajev
5626c87e04 Change contacts.uuid and domains.uuid to NOT NULL 2018-06-13 07:27:29 +03:00
Artur Beljajev
9f93c7365c Merge branch 'remove-dev-rake-task' into registry-849
# Conflicts:
#	lib/tasks/dev.rake
2018-06-12 08:36:25 +03:00
Artur Beljajev
76f8a46faa Update fixtures 2018-06-12 08:31:41 +03:00
Artur Beljajev
50b66476c1 Merge branch 'add-uuid-db-columns' into registry-849 2018-06-12 08:01:10 +03:00
Artur Beljajev
1eca44f32c Add domains.uuid DB column 2018-06-12 07:34:40 +03:00
Artur Beljajev
981c564214 Add contacts.uuid DB column 2018-06-12 07:29:47 +03:00
Artur Beljajev
4b977dc195 Enable "pgcrypto" postgres engine 2018-06-12 07:25:39 +03:00
Artur Beljajev
fd383a9c18 Allow creating a background job with run_at in the past
#790
2018-06-11 10:59:19 +03:00
Artur Beljajev
e34ef78c4d Merge branch 'remove-dev-rake-task' into registry-790 2018-06-11 10:09:01 +03:00
Artur Beljajev
81f923ab01 Update fixture 2018-06-11 10:04:29 +03:00
Artur Beljajev
9b07db8fc9 Remove dev rake task
`db:fixtures:load` should be preferred instead
2018-06-11 09:53:09 +03:00
Artur Beljajev
c2d5b7c704 Extract method 2018-06-11 08:26:17 +03:00
Artur Beljajev
4e2bd9f2da Improve readability 2018-06-11 08:13:35 +03:00
Artur Beljajev
304b04bd61 Remove domains.statuses_before_force_delete from REST API 2018-06-11 06:19:33 +03:00
Artur Beljajev
36b137eb84 Merge branch 'master' into registry-791 2018-06-09 08:01:10 +03:00
Artur Beljajev
ec76a6bbc0 Remove monkey patch 2018-06-09 07:57:38 +03:00
Artur Beljajev
ff1f926f34 Merge remote-tracking branch 'origin/copy-puma-config-from-rails5' into registry-849 2018-06-09 05:30:39 +03:00
Artur Beljajev
c6703c888c Merge remote-tracking branch 'origin/improve-code-climate' into improve-code-climate 2018-06-09 05:24:04 +03:00
Artur Beljajev
cd107916bc Update CodeClimate config 2018-06-09 05:23:55 +03:00
Artur Beljajev
6d36933b39 Merge branch 'rails5-api-controller-backport' into registry-849 2018-06-09 05:20:28 +03:00
Artur Beljajev
41cb23f22f Backport Rails 5 API controller 2018-06-09 05:04:21 +03:00
Artur Beljajev
a6a30139a1 Merge remote-tracking branch 'origin/remove-lib-from-autoload-path' into registry-849 2018-06-09 04:57:12 +03:00
Artur Beljajev
f5e19d2c1e Copy "puma" gem config from Rails 5 2018-06-09 04:37:03 +03:00
Artur Beljajev
303d2de96f Merge branch 'fix-translations' into registry-849 2018-06-09 03:50:02 +03:00
Artur Beljajev
4554fc4ec9 Remove unneded .agignore 2018-06-08 03:18:47 +03:00
Artur Beljajev
ff5b2c1c48 Fix translations 2018-06-08 03:11:53 +03:00
Artur Beljajev
67bd26df39 Merge branch 'improve-test-env-config' into registry-849 2018-06-08 02:31:40 +03:00
Artur Beljajev
abef25dd19 Add "uglifier" gem for es6 compression 2018-06-08 02:19:47 +03:00
Artur Beljajev
c44f3df7f5 Remove Rubocop inline directives 2018-06-07 19:17:16 +03:00
Maciej Szlosarczyk
f1294508d1
Improve setup of a locally failing test 2018-06-07 14:46:18 +03:00
Artur Beljajev
7a5a46b158 Fix CodeClimate issues 2018-06-06 22:09:37 +03:00
Artur Beljajev
c37f162529 Merge branch 'master' into registry-790 2018-06-06 21:53:08 +03:00
Artur Beljajev
838337cba4 Merge branch 'master' into improve-code-climate 2018-06-06 21:50:45 +03:00
Artur Beljajev
66dd10302d Merge branch 'master' into remove-rubocop-gem 2018-06-06 21:50:01 +03:00