Commit Graph

332 Commits

Author SHA1 Message Date
Alexander Machehin 028159b6af update redcarpet 2015-07-07 16:07:17 +05:00
Vokhmin Alexey V 0d0489ea21 Update paperclip gem 2015-06-23 00:09:33 +03:00
Vokhmin Alexey V b8755fd0f8 Update jquery-rails gem 2015-06-17 21:21:29 +03:00
Vokhmin Alexey V 5912c81d19 Update slim gem 2015-06-17 21:18:54 +03:00
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
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
Alexander Machehin 33790f884c [#369] small improvements; project page 2014-07-01 20:52:52 +06:00
Vokhmin Alexey V 0aff293ddc Merge branch 'master' into 403-check-that-all-packages-exist-on-filestore-before-publishing 2014-06-23 20:53:02 +04:00
Vokhmin Alexey V 88b0d54f02 #403: added specs for FileStoreService::File 2014-06-21 00:12:19 +04:00
Alexander Machehin 19afa17693 enable angularjs html5 mode 2014-06-19 14:30:45 +06:00
Vokhmin Alexey V 7d77c030ef #397: display dependent projects 2014-06-13 01:41:27 +04:00
Alexander Machehin aa959496c9 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/shared/_build_results.html.haml
2014-06-02 19:46:58 +06:00
Alexander Machehin 9795f3b5bc update rails to 4.0.5 2014-05-07 12:33:41 +06:00
Alexander Machehin a36457b5f3 [#369] add codemirror gem 2014-05-06 17:07:36 +06:00
Alexander Machehin 8d211e5a75 [#369] remove ngTable; update all issues table 2014-05-06 01:16:15 +06:00
Alexander Machehin 5075486405 [#369] remove codemirror highlighting 2014-04-29 13:19:08 +06:00
Alexander Machehin 2a8fa0e64b [#369] add ngTable 2014-04-28 14:36:12 +06:00
Vokhmin Alexey V eeb339ea43 #369: add ngmin-rails gem 2014-04-22 20:57:38 +04:00
Alexander Machehin a5a645ccbf Revert "[#369] use ngmin pre-minifier"
This reverts commit 08fe0f6832.
2014-04-22 18:32:50 +06:00
Alexander Machehin 08fe0f6832 [#369] use ngmin pre-minifier 2014-04-22 18:24:48 +06:00
Alexander Machehin 2a1ab0d77f [#369] update uglifier 2014-04-22 18:03:09 +06:00
Alexander Machehin ae7de6776d Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-17 13:15:10 +06:00
Alexander Machehin dd41f41867 [#369] add codemirror editor 2014-04-16 21:56:24 +06:00
Alexander Machehin 0d0c03105a [#369] update Gemfile.lock 2014-04-15 19:06:52 +06:00
Alexander Machehin d66d9accaf Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	vendor/assets/javascripts/old-codemirror.js
	vendor/assets/javascripts/old-codemirror/keymaps/emacs.js
	vendor/assets/javascripts/old-codemirror/keymaps/vim.js
	vendor/assets/javascripts/old-codemirror/modes/clike.js
	vendor/assets/javascripts/old-codemirror/modes/clojure.js
	vendor/assets/javascripts/old-codemirror/modes/coffeescript.js
	vendor/assets/javascripts/old-codemirror/modes/css.js
	vendor/assets/javascripts/old-codemirror/modes/diff.js
	vendor/assets/javascripts/old-codemirror/modes/gfm.js
	vendor/assets/javascripts/old-codemirror/modes/go.js
	vendor/assets/javascripts/old-codemirror/modes/groovy.js
	vendor/assets/javascripts/old-codemirror/modes/haskell.js
	vendor/assets/javascripts/old-codemirror/modes/htmlembedded.js
	vendor/assets/javascripts/old-codemirror/modes/htmlmixed.js
	vendor/assets/javascripts/old-codemirror/modes/javascript.js
	vendor/assets/javascripts/old-codemirror/modes/jinja2.js
	vendor/assets/javascripts/old-codemirror/modes/less.js
	vendor/assets/javascripts/old-codemirror/modes/lua.js
	vendor/assets/javascripts/old-codemirror/modes/markdown.js
	vendor/assets/javascripts/old-codemirror/modes/mysql.js
	vendor/assets/javascripts/old-codemirror/modes/ntriples.js
	vendor/assets/javascripts/old-codemirror/modes/pascal.js
	vendor/assets/javascripts/old-codemirror/modes/perl.js
	vendor/assets/javascripts/old-codemirror/modes/php.js
	vendor/assets/javascripts/old-codemirror/modes/plsql.js
	vendor/assets/javascripts/old-codemirror/modes/python.js
	vendor/assets/javascripts/old-codemirror/modes/r.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-changes.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-spec.js
	vendor/assets/javascripts/old-codemirror/modes/rst.js
	vendor/assets/javascripts/old-codemirror/modes/ruby.js
	vendor/assets/javascripts/old-codemirror/modes/rust.js
	vendor/assets/javascripts/old-codemirror/modes/scheme.js
	vendor/assets/javascripts/old-codemirror/modes/shell.js
	vendor/assets/javascripts/old-codemirror/modes/smalltalk.js
	vendor/assets/javascripts/old-codemirror/modes/sparql.js
	vendor/assets/javascripts/old-codemirror/modes/stex.js
	vendor/assets/javascripts/old-codemirror/modes/tiddlywiki.js
	vendor/assets/javascripts/old-codemirror/modes/velocity.js
	vendor/assets/javascripts/old-codemirror/modes/verilog.js
	vendor/assets/javascripts/old-codemirror/modes/xml.js
	vendor/assets/javascripts/old-codemirror/modes/xmlpure.js
	vendor/assets/javascripts/old-codemirror/modes/yaml.js
	vendor/assets/javascripts/old-codemirror/overlay.js
	vendor/assets/javascripts/old-codemirror/runmode.js
	vendor/assets/javascripts/vendor.js
	vendor/assets/stylesheets/old-codemirror.scss
	vendor/assets/stylesheets/old-codemirror/modes/diff.scss
	vendor/assets/stylesheets/old-codemirror/modes/rpm-spec.scss
	vendor/assets/stylesheets/old-codemirror/modes/tiddlywiki.scss
	vendor/assets/stylesheets/old-codemirror/themes/cobalt.scss
	vendor/assets/stylesheets/old-codemirror/themes/eclipse.scss
	vendor/assets/stylesheets/old-codemirror/themes/elegant.scss
	vendor/assets/stylesheets/old-codemirror/themes/monokai.scss
	vendor/assets/stylesheets/old-codemirror/themes/neat.scss
	vendor/assets/stylesheets/old-codemirror/themes/night.scss
	vendor/assets/stylesheets/old-codemirror/themes/rubyblue.scss
	vendor/assets/stylesheets/vendor.scss
2014-04-15 19:04:27 +06:00
Alexander Machehin 205905e0dd Merge branch 'master' into 369-remove_codemirror 2014-04-15 16:02:32 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Vokhmin Alexey V b577cd2b60 Update puma 2.8.1 => 2.8.2 2014-04-14 14:09:08 +04:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Vokhmin Alexey V 773c1701ad Cleans ApiDefender statistics 2014-04-05 23:19:04 +04:00
Alexander Machehin 7644a0f4cc [#369] remove angular-busy; add loading-bar 2014-04-04 16:15:15 +06:00
Alexander Machehin c08fd6d569 [#369] add angular spinner; some fixes 2014-04-02 16:33:05 +06:00
Vokhmin Alexey V e367a5e0dd #370: generate sitemap 2014-03-29 02:14:37 +04:00
Alexander Machehin 313056a8c6 [#345] add bootstrap-sass gem 2014-03-28 14:31:59 +06: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
Alexander Machehin b7e745d86e [#345] remove observers gem; remove old redhillonrails gem 2014-03-12 21:07:57 +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 f8ba1d05a0 Cleanup 2014-02-27 00:50:39 +04:00
Vokhmin Alexey V c5e3c7121e Updated therubyracer 2014-02-25 23:19:41 +04:00