Commit Graph

57 Commits

Author SHA1 Message Date
Kolan Sh 6978a86c97 Merge tag 'v3.7.0' into backbone.ws 2013-02-14 00:52:45 +04:00
Holger Just 6d3dc6e619 Bump json gem to a safe version for CVE-2013-0269, CVE-2013-0333 2013-02-13 15:18:17 +01:00
Holger Just fd306095c6 Bump Rails to 2.3.17 #1233 2013-02-13 15:18:17 +01:00
Kolan Sh b4e5f6cd0d Merge tag 'v3.6.0' into backbone.ws 2013-01-30 11:14:50 +04:00
Felix Schäfer dc66e8f831 Bump Rails version to 2.3.16 #1219 2013-01-29 21:24:25 +01:00
Kolan Sh 9ebbce7ba3 Merge branch 'master' into backbone.ws 2013-01-09 19:17:57 +04:00
Holger Just bf4ed9b37b Bump Rails version to 2.3.15 #1200 2013-01-09 13:56:43 +01:00
Kolan Sh 19f2859e1b v3.4.0 merged to backbone.ws 2013-01-07 17:14:21 +04:00
Felix Schäfer 4d4efa482e Use capybara < 2 as capybara 2 drops ruby 1.8 support 2013-01-02 16:36:49 +01:00
Felix Schäfer 7437eaea53 Bump net-ldap #1078 2012-08-11 10:27:32 +04:00
Felix Schäfer d24d4ce6b6 Stick with a working version of mocha
mocha 0.12.2 is known not to work with test/unit:
https://github.com/freerange/mocha/issues/94

Pinning the version of mocha until this is resolved
2012-08-06 10:34:41 +02:00
Felix Schäfer a642a1fdc4 Bump net-ldap #1078 2012-07-14 21:16:16 +02:00
Kolan Sh 1e908da66c Merge branch 'master' into backbone.ws 2012-06-15 00:12:40 +04:00
Felix Schäfer 1f91054244 Switch from vendored gravatar lib to gravatarify gem #1033 2012-06-09 17:39:22 +02:00
Felix Schäfer 69656422a1 Test ChiliProject on rubinius on Travis
rubinius 1.9-mode won't load liquid currently:
https://github.com/Shopify/liquid/pull/107
2012-06-07 14:30:45 +02:00
Felix Schäfer 03dfae0529 ChiliProject on Travis <3 <3 <3 2012-05-14 10:45:50 +02:00
Kolan Sh e5de5f43cc v3.1.0 merged 2012-04-05 13:22:02 +04:00
Kolan Sh 786e92349b Automatic character encoding detection in Mercurial repos. 2012-03-24 23:39:33 +04:00
Holger Just 68efc3de32 [#903] Require updated tzinfo with fix for Ruby 1.9.3 2012-03-18 18:15:08 +01:00
Felix Schäfer 900eda7a23 Don't require a specific pg gem version #915
pg was locked to ~> 0.9.0 as it was the last version to support ruby 1.8.6, we don't support it officially anymore, thus we can remove the version requirement.

Contributed by Dies Koper.
2012-03-01 12:56:31 +01:00
Holger Just 0fd499afca Merge branch 'master' into unstable 2012-02-06 22:47:35 +01:00
Holger Just 43afcde38d [#875] Fix typo 2012-02-01 17:26:07 +01:00
Holger Just 8e85cbdc11 [#839] Remove ruby-debug dependency.
It completely breaks on Ruby 1.9.3-p0. This is a stopper for people installing all groups. For the rest it is rarely used at all. Developers and testers requiring it can include it into their Gemfile.local
2012-01-29 19:55:32 +01:00
Holger Just e85947c7d4 Merge branch 'master' into unstable 2012-01-18 19:18:27 +01:00
Holger Just 11b441f745 Load Gemfiles from vendor/chiliproject_plugins 2012-01-11 12:02:25 +01:00
Eric Davis 7d1c0374e4 Merge branch 'ticket/unstable/747-capybara' into unstable 2011-12-09 13:28:33 -08:00
Felix Schäfer aa88fe8e39 Merge branch 'coderay-1.0' of https://github.com/rubychan/chiliproject into rubychan-coderay-1.0 2011-12-09 16:50:20 +01:00
Eric Davis a2feb14c83 [#747] Include capybara for integration tests 2011-12-01 16:46:50 -08:00
Eric Davis 4b5d4307d2 Merge branch 'ticket/unstable/720-tagging' into unstable 2011-12-01 15:58:29 -08:00
Eric Davis f179fea7bf [#720] Use = to show the explicit dependency 2011-12-01 15:58:05 -08:00
Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
Felix Schäfer 166d65b26d [#258] Unvendor net-ldap 2011-11-25 20:54:23 +01:00
Eric Davis 8fc2b72740 [#720] Add acts-as-taggable-on gem and migration for tag support
As per the gem docs, 2.1.0 is the last Rails 2.x compatable version
2011-11-25 11:23:34 -08:00
Eric Davis 4289559b5f [#604] Require the liquid gem 2011-11-19 23:31:05 +01:00
Holger Just cb0d4725ad Only allow the mysql database adapter on Ruby 1.8 2011-10-31 17:33:51 +01:00
Kornelius Kalnbach 65af1e4436 #649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine 2011-10-29 11:35:16 +02:00
Holger Just 35c96b5085 Fix typo... 2011-10-26 22:18:33 +02:00
Holger Just 82debeef8b Specify rmagick versions and update distribution list
For ChiliProject 3.0 we will strictly require rmagick >= 2.0. If you need it,
you might have to update your distribution or install ImageMagick from
alternative sources.
2011-10-26 22:11:44 +02:00
Felix Schäfer a17ae46187 Don't require a very old rmagick by default.
There's a hint in the Gemfile for people with older distress.
2011-10-26 18:55:17 +02:00
Holger Just 48796c90dc [#617] Include database gems for mingw (Ruby on Windows) 2011-09-23 21:27:44 +02:00
Felix Schäfer ec4b42f24f Bump rails to 2.3.14 #584 2011-08-22 22:07:38 +02:00
Felix Schäfer 9dae76d564 This should fix it once and for all… #517
(Sorry for the commit-noise)
2011-08-21 23:36:03 +02:00
Felix Schäfer d8ce7564ce So let's try to hit all "ruby 1.8"s the hard way. 2011-08-21 23:12:21 +02:00
Felix Schäfer 0b57e936f5 Rip faster_csv out of lib into the Gemfile. #517 2011-08-21 19:26:43 +02:00
Holger Just c63954a4c7 Add ruby-debug as test dependency to debug failing tests 2011-07-25 21:22:57 +02:00
Eric Davis a35d61bfb7 [#506] Read Gemfile.local for local gem inclusions.
Contributed by Holger Just
2011-07-22 14:48:04 -07:00
Eric Davis 9c47208efa [#511] Fix string encodings coming from sqlite3 in MRI 1.9.x 2011-07-22 14:35:02 -07:00
Gregor Schmidt 2630a84e10 [#477] Not using deprecated rake/rdoctask but rdoc/task instead
works with all rdoc versions since 2.4.2
see https://github.com/rdoc/rdoc/blob/master/History.txt
2011-06-16 11:29:25 +02:00
Eric Davis 731de487e4 [#453] Upgrade to Rails 2.3.12 2011-06-10 10:43:12 -07:00
Eric Davis cff4e83044 [#290] Only print the plugin Gemfile messages when $DEBUG is set 2011-05-13 09:19:41 -07:00