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
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
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
Vokhmin Alexey V
015c0375e8
#29 : updated gems, remove old code
2014-01-15 23:34:54 +04:00
Alexander Machehin
e9079a6357
add therubyracer
2014-01-14 20:10:55 +06:00
Alexander Machehin
4156789a60
[ #29 ] update grit
2014-01-10 11:40:18 +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
Vokhmin Alexey V
08d51391e7
Updated puma && newrelic_rpm gems
2013-12-10 00:15:59 +04: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
Vokhmin Alexey V
f4f9ba5409
#312 : added RpmBuildNode model, fetch statistics
2013-11-09 01:14:04 +04:00
Vokhmin Alexey V
fafc898059
Added localeapp gem
2013-11-08 20:31:28 +04:00
Vokhmin Alexey V
21efb631b6
Rollback source of gems
2013-11-07 02:06:59 +04:00
Vokhmin Alexey V
bd29b5ef13
Use http://rubygems.org/
2013-11-07 01:27:19 +04:00
Vokhmin Alexey V
78d1adcfa3
added logglier gem
2013-11-07 01:22:13 +04:00
Vokhmin Alexey V
b2a1fe1533
#272 : use Rollbar and logentries
2013-09-27 15:49:11 +04:00
Vokhmin Alexey V
7c0135edc1
#298 : use native extensions
2013-09-11 19:16:18 +04:00
Vokhmin Alexey V
a160318368
#291 : use GitHub repo
2013-09-02 20:40:52 +04:00
Vokhmin Alexey V
a581a96e63
#291 : rollback Grack
2013-09-02 20:31:59 +04:00
Alexander Machehin
d65214b5df
try new grack
2013-09-02 14:36:27 +06:00
Vokhmin Alexey V
5bebaca4f0
#291 : added friendly_id
2013-09-01 19:33:09 +04:00
Vokhmin Alexey V
36259776a1
#267 : added sound notifications
2013-08-20 23:10:24 +04:00
Vokhmin Alexey V
e63592e6ac
#258 : removed backbone gem, small JS changes
2013-08-08 16:30:53 +04:00
Vokhmin Alexey V
a91bfe95c9
#251 : added js-routes gem, updated JS
2013-08-05 21:38:48 +04:00
Vokhmin Alexey V
b3ab16ec09
#251 : use AJAX for load data on BuildList#index page
2013-08-02 02:24:33 +04:00
Alexander Machehin
a8d76474aa
[ #200 ] update reqsue gems
2013-07-24 17:43:49 +06:00
Vokhmin Alexey V
78a33727a6
#214 : merge master into branch
2013-07-19 21:08:00 +04:00
Vokhmin Alexey V
cf436203d9
#214 : updated version of angular-i18n gem
2013-07-19 16:58:23 +04:00
Vokhmin Alexey V
c44b4ffda2
#214 : added "angular-i18n" gem, some refactoring
2013-07-19 16:34:55 +04:00
Vokhmin Alexey V
ef02f33a42
#219 : updated jbuilder gem
2013-07-16 17:21:59 +04:00
Vokhmin Alexey V
7586f5ee1b
#219 : use redis_store as Rails cache_store
2013-07-16 16:00:32 +04:00
Vokhmin Alexey V
d90ba55a08
#214 : updated Gemfile.lock
2013-07-15 18:08:28 +04:00
Vokhmin Alexey V
a37a23266f
#214 : added DateTime formatter
2013-07-15 14:11:17 +04:00
Vokhmin Alexey V
fe8e1216c5
#214 : remove unnecessary code
2013-07-12 23:27:49 +04:00
Vokhmin Alexey V
2e33f0038a
#214 : added ability to destroy branch
2013-07-11 17:03:02 +04:00
Vokhmin Alexey V
d747ffd070
#214 : updated #branches page, integrated AngularJS
2013-07-11 14:34:44 +04:00
Vokhmin Alexey V
b843652cff
#188 : added .travis.yml
2013-06-14 17:04:17 +04:00
Alexander Machehin
7f4b64845a
update airbrake to current stable version
2013-06-03 23:35:35 +06:00
Vokhmin Alexey V
f8d0320d23
#34 : added new hooks, some refactoring according to Alexander's comments
2013-04-15 17:34:11 +04:00
warpc
0f95623470
Merge pull request #57 from abf/rosa-build:30-social-login-and-open-registration
...
[refs #30 ]: Social login and open registration
2013-04-10 16:52:50 +04:00
Alexander Machehin
7d7df64611
[ #19 ] restore codemirror highlight for comments code
2013-04-05 17:34:22 +06:00
Vokhmin Alexey V
ac678ee520
#29 : update "grit" gem
2013-04-03 16:50:01 +04:00
Vokhmin Alexey V
9e7eb7af94
#29 : merge master into branch
2013-04-03 16:10:22 +04:00
Alexander Machehin
e78e73cae8
[ #19 ] add gitlabhq markdown
2013-03-29 00:22:24 +06:00
Vokhmin Alexey V
c2e89f8781
#30 : use omniauth for registration through Facebook, GitHub, Google
2013-03-26 03:13:15 +04:00
Alexander Machehin
7d1c5f381b
restore redhillonrails_core gem
2013-03-19 18:30:34 +06:00
Alexander Machehin
d3469f524a
update rails to 3.2.13 && gems update
2013-03-19 15:15:14 +06:00
Vokhmin Alexey V
089865270a
#29 : update rails
2013-03-18 19:13:43 +04:00
Vokhmin Alexey V
29eed84f7d
#29 : update "newrelic_rpm" and fix "undefined method empty? for nil:NilClass"
2013-03-18 16:42:45 +04:00
Vokhmin Alexey V
6bb2188c2f
update path to rubygems.org in Gemfile.lock
2013-03-11 16:32:11 +04:00
Vokhmin Alexey V
5a8ed6124a
remove "json" gem from Gemfile
2013-02-12 13:06:04 +04:00
Vokhmin Alexey V
8aeda1f087
Update "rails" and "json" gems
2013-02-12 12:57:03 +04:00
Vladmir Sharhsov(warpc)
6478f4a3b1
Denial of Service and Unsafe Object Creation Vulnerability in JSON [CVE-2013-0269]
2013-02-11 22:36:53 +04:00
Vokhmin Alexey V
7868434f99
#883 : update "newrelic_rpm" gem, bundle update
2013-02-04 19:19:04 +04:00
Alexander Machehin
87be12a6b7
Fix error with avatars:
...
[paperclip] An error was received while processing:
Paperclip::Errors::NotIdentifiedByImageMagickError: ... is not recognized by the 'identify' command.
2013-02-04 00:44:33 +06:00
Vokhmin Alexey V
c1cbda5fdc
#860 : bundle update
2013-01-29 18:42:39 +04:00
Alexander Machehin
9297699a79
[refs #811 ] add Turbo Sprockets
2013-01-25 13:18:50 +06:00
Vokhmin Alexey V
b1606d9241
#794 : bundle update
2013-01-18 20:04:17 +04:00
Vokhmin Alexey V
097ffacf61
#794 : merge master into branch
2013-01-16 19:07:39 +04:00
Alexander Machehin
71125eac81
update rails to 3.2.11
2013-01-09 14:25:21 +06:00
Alexander Machehin
2a5a955bfb
[refs #796 ] use MockRedis in specs
2012-12-26 19:07:54 +06:00
Vokhmin Alexey V
0ad9932561
#794 : fixes for failed specs
2012-12-20 22:50:55 +04:00
Vokhmin Alexey V
334b078855
#794 : update KeyPair model, write migration
2012-12-19 22:18:00 +04:00
Vokhmin Alexey V
8757724acc
#778 : update rails gem, update destroy Platform and Reposytory
2012-12-17 16:28:17 +04:00
Alexander Machehin
345e4f698b
Merge branch 'master' into file-store-4_git_task
...
Conflicts:
Gemfile
2012-11-02 23:08:38 +06:00
Alexander Machehin
6d3a2e7bb3
Merge remote-tracking branch 'origin/file-store-4_git_task' into file-store-4_git_task
2012-11-01 23:39:08 +06:00
Alexander Machehin
84920c358a
[refs file-store-4] upload to file-store
2012-11-01 23:37:09 +06:00
Vokhmin Alexey V
36ae61cea0
#686 : updated jbuilder gem
2012-10-17 16:18:05 +04:00
Vokhmin Alexey V
6bc3c4b9a8
#90 : updated redhillonrails_core gem
2012-10-01 22:09:59 +04:00
Alexander Machehin
2b4e2f03e5
Merge pull request #585 from warpc/374-rest_api_for_builds
...
[refs #374 ] Add json responses for build lists api
2012-09-27 07:00:19 -07:00
Vladimir Sharshov
181e95a9d2
Moving Apidocs to separate project
2012-09-27 01:06:57 +04:00
konstantin.grabar
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
Alexander Machehin
a4c8e8eff8
Merge branch 'master' into 616-issues_and_comments
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
konstantin.grabar
15ec2c2c90
[refs #374 ] Add nanoc api docs
2012-09-07 20:55:48 +04:00
konstantin.grabar
58d9a972ef
[refs #374 ] Add rate limit
2012-09-04 22:48:14 +04:00
Alexander Machehin
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
Pavel Chipiga
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
Pavel Chipiga
01a3572de0
Minor update. Fix helper bug. Minor refactor. Refs #263
2012-07-31 17:35:18 +03:00
Pavel Chipiga
27030566a4
Update rails, grit, gollum. Fix re-encoding bug. Refs #263
2012-07-30 02:32:23 +03:00
Pavel Chipiga
35e673d44e
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
2012-07-27 00:15:57 +03:00
Pavel Chipiga
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
konstantin.grabar
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +04:00
Pavel Chipiga
b47b4ec075
Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510
2012-06-16 21:27:46 +03:00
konstantin.grabar
76b261638f
Merge master into 505-state_machine_migrate
2012-06-14 10:34:55 +04:00
konstantin.grabar
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
konstantin.grabar
38b55d769f
[refs #510 ] Add resque async workers
2012-05-31 11:02:25 +04:00
konstantin.grabar
44de11d009
[refs #505 ] Add events, states and other base state machine logic
2012-05-28 21:47:53 +04:00
Pavel Chipiga
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
Pavel Chipiga
7af06cc7ab
Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263
2012-04-23 23:55:42 +03:00
Pavel Chipiga
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
Pavel Chipiga
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00