Vokhmin Alexey V
|
cc368808cc
|
Merge branch 'master' into 345-update_to_rails4
|
2014-03-14 21:34:39 +04:00 |
|
avokhmin
|
16bdf02188
|
Merge pull request #367 from abf/rosa-build:247-remove_deprecated_live_event
#247 remove deprecated live event
|
2014-03-14 21:32:55 +04:00 |
Alexander Machehin
|
4e54af6753
|
[#345] remove deprecated live event
|
2014-03-14 23:20:57 +06:00 |
|
Vokhmin Alexey V
|
58c057b5c2
|
#345: Fixed: relation "parent_platforms" does not exist
|
2014-03-14 03:21:53 +04:00 |
|
Vokhmin Alexey V
|
e7f8fb6312
|
#345: Fixed JS
|
2014-03-14 03:00:52 +04:00 |
|
Vokhmin Alexey V
|
4c398ab710
|
#345: fixed presenters, etc
|
2014-03-14 02:31:28 +04:00 |
|
Vokhmin Alexey V
|
331944e0fd
|
#345: updated keys
|
2014-03-14 01:36:28 +04:00 |
|
Vokhmin Alexey V
|
d1ea49c680
|
Merge branch 'master' into 345-update_to_rails4
Conflicts:
app/models/platform_arch_setting.rb
|
2014-03-13 23:56:15 +04:00 |
|
Alexander Machehin
|
e7bcf2dac4
|
[#345] small method refactoring
|
2014-03-13 22:46:21 +06:00 |
|
Alexander Machehin
|
718c8bb08c
|
[#345] remove url_for hack
|
2014-03-13 22:35:00 +06:00 |
|
Alexander Machehin
|
5aa5997203
|
[#345] fix error with path method
|
2014-03-13 22:32:36 +06:00 |
|
Alexander Machehin
|
8ff7ae6870
|
[#345] temporaly fix error with mass-assign protected attributes
|
2014-03-13 16:43:04 +06:00 |
|
Alexander Machehin
|
bfc64162e1
|
[#345] remove unneeded serialize line
|
2014-03-13 16:26:07 +06:00 |
|
Alexander Machehin
|
3229b7c3bb
|
[#345] update schema.rb
|
2014-03-13 16:23:53 +06:00 |
|
Alexander Machehin
|
f8aa106919
|
[#345] small refactoring
|
2014-03-13 16:23:14 +06:00 |
|
Alexander Machehin
|
d51d917fa4
|
[#345] remove deprecated live event
|
2014-03-13 16:09:00 +06:00 |
|
avokhmin
|
61a7879170
|
Merge pull request #366 from abf/rosa-build:fix-autostart-projects
Fix: autostart project build_lists
|
2014-03-13 01:31:58 +04:00 |
|
Vokhmin Alexey V
|
799220bd06
|
cleanup
|
2014-03-13 01:21:16 +04:00 |
|
Vokhmin Alexey V
|
29d603f5c8
|
Fix: autostart_build_lists
|
2014-03-13 00:49:36 +04:00 |
|
Alexander Machehin
|
bdcbc7e837
|
[#345] change devise routes
|
2014-03-12 21:59:57 +06:00 |
|
Alexander Machehin
|
b7e745d86e
|
[#345] remove observers gem; remove old redhillonrails gem
|
2014-03-12 21:07:57 +06:00 |
|
Alexander Machehin
|
81d628c605
|
[#345] remove deprecation warning
|
2014-03-12 19:23:39 +06:00 |
|
Alexander Machehin
|
694f41f036
|
[#345] remove warning: default_scope without a block is deprecated
|
2014-03-12 19:20:32 +06:00 |
|
Alexander Machehin
|
8d0720091a
|
[#345] simplify config
|
2014-03-12 19:15:06 +06:00 |
|
Alexander Machehin
|
9fb226acef
|
[#345] fix error with quotes
|
2014-03-12 19:14:19 +06:00 |
|
Alexander Machehin
|
50b7c8b92b
|
Temporaly fix deploy
|
2014-03-12 16:04:28 +06:00 |
|
Alexander Machehin
|
d78879c691
|
[#345] hide devise secret
|
2014-03-12 10:57:32 +06:00 |
|
Alexander Machehin
|
211b403897
|
[#345] remove an unnecessary line
|
2014-03-11 19:58:20 +06:00 |
|
Alexander Machehin
|
b73556da4a
|
[#345] fix No such middleware to insert after: Rack::Lock (RuntimeError)
|
2014-03-11 19:45:48 +06:00 |
|
Alexander Machehin
|
f05f0e1d72
|
[#345] fix activity concern
|
2014-03-11 19:44:30 +06:00 |
|
Alexander Machehin
|
7250b1ae81
|
[#345] remove a deprecated option
|
2014-03-11 18:53:08 +06:00 |
|
Alexander Machehin
|
21cfb69acf
|
[#345] try fix PG::UndefinedObject: ERROR: type "hstore" does not exist
|
2014-03-11 18:50:40 +06:00 |
|
Alexander Machehin
|
fcc7af94df
|
[#345] small refactoring
|
2014-03-11 18:40:44 +06:00 |
|
Alexander Machehin
|
f99211da9a
|
[#345] remove deprecations with association conditions
|
2014-03-11 18:40:02 +06:00 |
|
Alexander Machehin
|
a559d7f918
|
[#345] avoid lazy load because
ActiveRecord::StatementInvalid - PG::ProtocolViolation: ERROR: bind message supplies 4 parameters,
but prepared statement "a7" requires 2
|
2014-03-11 18:21:50 +06:00 |
|
Alexander Machehin
|
ef63ddcaac
|
[#345] fix mistypes
|
2014-03-11 17:47:03 +06:00 |
|
Alexander Machehin
|
a4e2b6cfd1
|
[#345] downgrade jquery-rails version because Sprockets::FileNotFound - couldn't find file 'jquery-ui'
|
2014-03-11 17:34:06 +06:00 |
|
Alexander Machehin
|
d5f2e87f1c
|
[#345] remove assets group from the Gemfile; fix compass-rails version
|
2014-03-11 17:21:06 +06:00 |
|
Alexander Machehin
|
b05ecd23d4
|
[#345] fix Sass::SyntaxError - File to import not found or unreadable
|
2014-03-11 16:44:29 +06:00 |
|
Alexander Machehin
|
d836cbe259
|
[#345] fix url_for
|
2014-03-11 15:56:34 +06:00 |
|
Alexander Machehin
|
3fbaa265c3
|
[#345] fix mistype
|
2014-03-11 15:56:06 +06:00 |
|
Alexander Machehin
|
775ab380a2
|
[#345] move markdown to helper
|
2014-03-11 15:55:42 +06:00 |
|
Alexander Machehin
|
0a7d5d22da
|
[#345] move lib/modules/models to app/models/concerns; small refactoring
|
2014-03-11 14:58:36 +06:00 |
|
Alexander Machehin
|
a5f56bb835
|
[#345] remove observers; use new labmda syntax
|
2014-03-11 14:28:17 +06:00 |
|
Alexander Machehin
|
a81b5fc69e
|
Merge branch 'master' into 345-update_to_rails4
Conflicts:
Gemfile
Gemfile.lock
|
2014-03-07 16:25:32 +06:00 |
|
Alexander Machehin
|
31edf3e57c
|
small refactoring the skype recipe
|
2014-03-06 21:50:58 +06:00 |
|
Alexander Machehin
|
2e4112e6a4
|
Add skype notifications
|
2014-03-06 21:45:33 +06:00 |
|
avm
|
afc01cfe96
|
Merge pull request #364 from abf/rosa-build:247-remove_private_users
#247 remove old code (part 2)
|
2014-03-06 16:57:29 +04:00 |
|
avm
|
3a9e016f3f
|
Merge pull request #363 from abf/rosa-build:247-remove_related_models
#247 remove old code
|
2014-03-06 16:56:46 +04:00 |
|
Alexander Machehin
|
636ae022bf
|
[#247] remove private users
|
2014-03-06 17:24:33 +06:00 |