Commit Graph

278 Commits

Author SHA1 Message Date
Vokhmin Alexey V 498aeb9777 Update schema_plus gem 2015-06-17 21:18:54 +03:00
Alexander Machehin c77dc80f12 revert angularjs 2015-06-17 21:18:53 +03:00
Vokhmin Alexey V d56f14a9a8 Update Rails to 4.2.1 2015-06-17 21:18:53 +03:00
Alexander Machehin 6b5705c348 update rack/rails/jquery-rails 2015-06-17 08:29:55 +05:00
Alexander Machehin 320863e26d Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-06-02 22:32:47 +05:00
Alexander Machehin 635bc92d8e add rack-mini-profiler 2015-06-02 22:32:25 +05:00
Vokhmin Alexey V 621b74fef2 #472: Update activeadmin gem, some fixes 2015-06-01 22:57:00 +03:00
Vokhmin Alexey V 4dfdd3b10d #472: Remove protected_attributes gem, use strong_parameters for Api::V1::AdvisoriesController 2015-06-01 22:56:56 +03:00
Alexander Machehin a4ca058922 Merge branch 'master' into rails-4.1.10 2015-04-24 16:29:09 +05:00
Alexander Machehin f0f257505c update redcarpet 2015-04-24 16:27:22 +05:00
Vokhmin Alexey V 4de3c7edc5 Update protected_attributes gem 2015-04-24 03:18:37 +03:00
Vokhmin Alexey V 7571d339d8 Update rest-client gem 2015-04-24 01:21:45 +03:00
Vokhmin Alexey V a26dfa099d Rails 4.1.10 release 2015-04-24 01:19:32 +03:00
Alexander Machehin c7d5ca7305 Merge branch 'master' into 465-use-pundit-instead-of-cancan 2015-04-14 19:21:42 +05:00
Alexander Machehin 945cb20ef7 downgrate grit; again 2015-04-08 20:02:22 +05:00
Alexander Machehin 74e5d08383 downgrade grit 2015-04-08 19:30:05 +05:00
Alexander Machehin 06fbf84e10 Revert "update grit"
This reverts commit b7e70d839d.
2015-04-08 19:02:11 +05:00
Vokhmin Alexey V 4fec2213c8 #465: added pundit gem, wip... 2015-04-07 23:01:25 +03:00
Alexander Machehin b7e70d839d update grit 2015-04-07 23:31:18 +05:00
Alexander Machehin f202d1d449 new diff; in progress 2015-04-06 22:44:37 +05:00
Alexander Machehin 366e17b75d add rack-utf8_sanitizer gem 2015-03-25 17:34:56 +05:00
Alexander Machehin dabab0561d use rails-assets-notifyjs gem from rails-assets.org 2015-03-20 15:07:35 +05:00
Alexander Machehin 3004074e2e downgrade simple_form because bootstrap 3 2015-03-12 19:33:15 +05:00
Vokhmin Alexey V 3ed742e39a Use only state_machines-activerecord gem 2015-03-05 03:01:52 +03:00
Vokhmin Alexey V 7f285fce5c added state_machines-activerecord gem 2015-03-05 02:39:16 +03:00
Vokhmin Alexey V 5e5d3905e4 Update rails to 4.1.9 2015-03-05 02:09:50 +03:00
Vokhmin Alexey V db4d1ba457 update rspec-rails gem 2015-02-19 04:12:08 +03:00
Vokhmin Alexey V 629867cee7 Update rails gem: 4.0.11 => 4.0.13 2015-02-19 02:04:42 +03:00
Vokhmin Alexey V 7c5e5906f5 Update ruby to 2.2.0, gems 2015-02-13 03:36:18 +03:00
Vokhmin Alexey V 818f3bb77a Update puma gem 2015-02-13 02:25:11 +03:00
Alexander Machehin a36e46a769 [#369] update bootstrap-sass 2015-02-06 18:52:01 +05:00
Alexander Machehin 2a5ec70a6b [#369] project collaborators page: in progress 2014-11-15 01:36:39 +05:00
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Alexander Machehin f1afd46453 update rails to 4.0.11 2014-10-31 00:10:57 +05:00
Vokhmin Alexey V 1be09ee042 #369: updated simple_form styles 2014-10-28 22:20:23 +03:00
Vokhmin Alexey V 2bf34994a5 #369: added simple_form, updated #new, #edit actions for platform 2014-10-25 02:43:46 +04:00
Vokhmin Alexey V 1ae14ecd86 #369: use bootstrap for Platforms#show page 2014-10-24 03:27:30 +04:00
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
2014-10-16 16:41:29 +06:00
Alexander Machehin d11fe17937 again update grit 2014-10-07 22:36:05 +06:00
Alexander Machehin 41d04ae56b Revert "update grit"
This reverts commit 134dac6083.
2014-10-07 20:28:05 +06:00
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 6e2b7cbd63 Merge branch 'ruby-2.1.3' 2014-09-24 00:05:54 +04:00
Vokhmin Alexey V 6378c94744 Updated puma gem 2014-09-24 00:05:40 +04:00
Vokhmin Alexey V b14a34d48f Remove logglier gem 2014-09-23 22:37:33 +04:00
Vokhmin Alexey V 68d6dd6e37 Updated grit gem 2014-09-16 00:57:13 +04:00
Alexander Machehin 311bc2de5d update grit 2014-09-13 09:45:42 +06: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