4b5d4307d2
Merge branch 'ticket/unstable/720-tagging' into unstable
2011-12-01 15:58:29 -08:00
f179fea7bf
[ #720 ] Use = to show the explicit dependency
2011-12-01 15:58:05 -08:00
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
166d65b26d
[ #258 ] Unvendor net-ldap
2011-11-25 20:54:23 +01:00
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
4289559b5f
[ #604 ] Require the liquid gem
2011-11-19 23:31:05 +01:00
cb0d4725ad
Only allow the mysql database adapter on Ruby 1.8
2011-10-31 17:33:51 +01:00
35c96b5085
Fix typo...
2011-10-26 22:18:33 +02:00
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
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
48796c90dc
[ #617 ] Include database gems for mingw (Ruby on Windows)
2011-09-23 21:27:44 +02:00
ec4b42f24f
Bump rails to 2.3.14 #584
2011-08-22 22:07:38 +02:00
9dae76d564
This should fix it once and for all… #517
...
(Sorry for the commit-noise)
2011-08-21 23:36:03 +02:00
d8ce7564ce
So let's try to hit all "ruby 1.8"s the hard way.
2011-08-21 23:12:21 +02:00
0b57e936f5
Rip faster_csv out of lib into the Gemfile. #517
2011-08-21 19:26:43 +02:00
c63954a4c7
Add ruby-debug as test dependency to debug failing tests
2011-07-25 21:22:57 +02:00
a35d61bfb7
[ #506 ] Read Gemfile.local for local gem inclusions.
...
Contributed by Holger Just
2011-07-22 14:48:04 -07:00
9c47208efa
[ #511 ] Fix string encodings coming from sqlite3 in MRI 1.9.x
2011-07-22 14:35:02 -07:00
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
731de487e4
[ #453 ] Upgrade to Rails 2.3.12
2011-06-10 10:43:12 -07:00
cff4e83044
[ #290 ] Only print the plugin Gemfile messages when $DEBUG is set
2011-05-13 09:19:41 -07:00
ddcd4f2888
Pinning mysql2 gem to 0.2 branch, since 0.3 and the following are Rails 3 only
2011-05-10 08:42:37 +02:00
a0eb66fc98
[ #290 ] using ~> instead of < for i18n dependency
...
it is more accurate in this case
2011-05-10 08:40:58 +02:00
cbc26ea982
[ #290 ] Remove test gems from dev enviroment.
...
running single test without RAILS_ENV=test prefix seams to work without it.
2011-05-10 08:40:58 +02:00
326dffbc29
[ #290 ] Adding rmagick, making it opt-out
...
using version < 2.0 since later versions do not work w/o backports on Debian Lenny
2011-05-10 08:40:58 +02:00
ddcec2f4a0
[ #290 ] making openid opt-out by adding it to a group
2011-05-10 08:40:58 +02:00
8304c6847a
[ #290 ] loading mocha after shoulda to make sure, that mocha's patches can be properly applied
2011-05-10 08:40:58 +02:00
87d8634b04
[ #290 ] using bundler
...
* following setup instructions from http://gembundler.com/rails23.html
* adding generated files to .gitignore and .hgignore
* removing config.gem calls
* adding Gemfile that should work with all supported dbs and interpreters
* removing work-around for rubygems 1.5 deprecation. this seems to be fixed since now bundler handles the gem loading
2011-05-10 08:40:42 +02:00
Eric Davis
Felix Schäfer
Holger Just
Felix Schäfer
Gregor Schmidt