Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
|
Alexander Machehin
|
0cb585ef71
|
Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
|
2014-01-10 08:31:31 +06:00 |
Vokhmin Alexey V
|
d0e748cce0
|
#231: added PlatformArchSetting model, migration, updated views
|
2013-07-24 18:43:41 +04:00 |
|
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
|
Vokhmin Alexey V
|
129930b385
|
hot fix for failed specs
|
2012-12-13 23:28:50 +04:00 |
|
Vokhmin Alexey V
|
a8e1cea057
|
#759: save sec of time_living instead of minut, some fixes of state_machine
|
2012-12-07 15:11:12 +04:00 |