Commit Graph

213 Commits

Author SHA1 Message Date
Alexander Machehin 134dac6083 update grit 2014-10-06 20:11:59 +06:00
Alexander Machehin 55c1962b78 Revert "use updated grit"
This reverts commit 3f6ed02b3a.
2014-10-02 22:08:01 +06:00
Alexander Machehin 3f6ed02b3a use updated grit 2014-09-30 17:18:49 +06:00
Vokhmin Alexey V b14a34d48f Remove logglier gem 2014-09-23 22:37:33 +04:00
Alexander Machehin 8ee384775b downgrade jquery-rails to 2.3 2014-09-12 10:12:33 +06:00
Alexander Machehin e532d63257 downgrade ohm to 1.3.2 2014-09-11 23:07:35 +06:00
Alexander Machehin 247a1d8657 remove requiring 'emoji/railtie' 2014-09-11 14:39:38 +06:00
Alexander Machehin d8f61aa423 update gems 2014-08-29 20:57:16 +06:00
Alexander Machehin 7c75cc7571 update rails to 4.0.9 2014-08-29 20:07:18 +06:00
Alexander Machehin 21d705610b update rails to 4.0.8 2014-07-04 09:16:47 +06:00
Alexander Machehin 554fd5003e update rails to 4.0.7 2014-07-03 07:20:17 +06:00
Vokhmin Alexey V 88b0d54f02 #403: added specs for FileStoreService::File 2014-06-21 00:12:19 +04:00
Alexander Machehin 9795f3b5bc update rails to 4.0.5 2014-05-07 12:33:41 +06:00
Alexander Machehin dd41f41867 [#369] add codemirror editor 2014-04-16 21:56:24 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Vokhmin Alexey V 773c1701ad Cleans ApiDefender statistics 2014-04-05 23:19:04 +04:00
Vokhmin Alexey V e367a5e0dd #370: generate sitemap 2014-03-29 02:14:37 +04:00
Vokhmin Alexey V 4d7809ec14 #345: rollback changes, added test_after_commit gem 2014-03-20 02:35:59 +04:00
Vokhmin Alexey V c672aaa0ec #345: fixed some specs, etc 2014-03-18 00:18:46 +04:00
Vokhmin Alexey V 94e285e64f #345: updated gems, views, fixed specs 2014-03-15 01:55:28 +04:00
Vokhmin Alexey V e7f8fb6312 #345: Fixed JS 2014-03-14 03:00:52 +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 b7e745d86e [#345] remove observers gem; remove old redhillonrails gem 2014-03-12 21:07:57 +06:00
Alexander Machehin 50b7c8b92b Temporaly fix deploy 2014-03-12 16:04:28 +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 a81b5fc69e Merge branch 'master' into 345-update_to_rails4
Conflicts:
	Gemfile
	Gemfile.lock
2014-03-07 16:25:32 +06:00
Alexander Machehin 2e4112e6a4 Add skype notifications 2014-03-06 21:45:33 +06:00
Alexander Machehin 0a80306095 [#345] update gems 2014-03-06 13:44:14 +06:00
Alexander Machehin 83689a94c4 [#345] update rails & other gems 2014-02-27 16:33:16 +06:00
Vokhmin Alexey V c5e3c7121e Updated therubyracer 2014-02-25 23:19:41 +04:00
Vokhmin Alexey V 4250e31cdc Merge branch 'master' into 354-add-possibility-to-rebuild-projects-periodically
Conflicts:
	Gemfile.lock
2014-02-19 13:16:27 +04:00
Alexander Machehin 782eef0664 update rails to 3.2.17 2014-02-19 02:54:57 +06:00
Vokhmin Alexey V ea8bb0b42b #354:added specs for autostart build_lists 2014-02-18 01:02:48 +04:00
Alexander Machehin 0451c1eaa6 Merge branch 'master' into 347-update_paperclip
Conflicts:
	Gemfile.lock
2014-02-12 21:36:16 +06:00
Vokhmin Alexey V e889f23660 Configure resque-scheduler gem 2014-02-10 23:36:10 +04:00
Alexander Machehin 2bcf8c39f3 [#347] update paperclip gem; change file validations 2014-02-10 21:50:22 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Vokhmin Alexey V 00a630146f #29: updated whenever gem 2014-01-17 20:26:48 +04:00
Alexander Machehin e255c59261 [#29] remove iconv 2014-01-16 19:39:03 +06:00
Alexander Machehin e9079a6357 add therubyracer 2014-01-14 20:10:55 +06:00
Alexander Machehin 90406d5000 [#29] update grit 2014-01-10 11:11:00 +06:00
Alexander Machehin 50735fc977 [#29] add iconv gem 2014-01-10 09:30:22 +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
Alexander Machehin 9612ccdf19 Move git repository to rosa-abf 2013-12-06 14:21:20 +06:00
Alexander Machehin 9243d54a68 Merge branch 'master' into puma 2013-12-04 13:56:20 +06:00
Alexander Machehin d6a55e57a7 Update rails to 3.2.16 2013-12-04 13:55:35 +06:00
Vokhmin Alexey V 561d886a54 updated newrelic_rpm gem 2013-11-28 17:57:09 +04:00
Vokhmin Alexey V 5e5f5f3f07 Added puma gem 2013-11-27 21:07:18 +04:00