aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' into loofahRafael Mendonça França2014-08-171-1/+15
| |\
| * | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-171-4/+2
| * | Merge branch 'master' into loofahRafael Mendonça França2014-08-121-1/+7
| |\ \
| * \ \ Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-101-0/+5
| |\ \ \
| | * | | Point gems to all the right places.Timm2014-06-161-4/+4
| | * | | Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for ...Timm2014-06-161-0/+2
| | * | | Added Loofah as a dependency in actionview.gemspec.Timm2014-06-111-0/+3
* | | | | Use released arelRafael Mendonça França2014-08-171-1/+0
| |_|_|/ |/| | |
* | | | Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-171-0/+14
|\ \ \ \
| * | | | [ActiveJob] Use globalid gemAbdelkader Boudih2014-08-171-0/+1
| * | | | Clean adapter_test.rb and skip test for sidekiq in unsupported rubiesAbdelkader Boudih2014-08-131-11/+11
| * | | | Remove activejob integration testsAbdelkader Boudih2014-08-121-0/+13
| | |_|/ | |/| |
* / | | Allow usage of bundle local config for rack by specifying the branchCarlos Antonio da Silva2014-08-171-1/+1
|/ / /
* | | Test using turbolinks masterRafael Mendonça França2014-08-061-1/+1
* | | Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-231-0/+6
|/ /
* | Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-081-0/+1
|\ \ | |/ |/|
| * Upgraded rackJarmo Isotalo2014-05-191-0/+1
* | Mail 2.6.1 silences excessive warnings; remove Gemfile hackBenjamin Fleischer2014-06-081-1/+0
* | For our build, stick with mail 2.5.x for nowMatthew Draper2014-06-051-0/+1
* | Default config.assets.digests to true in developmentDan Kang2014-05-171-1/+1
|/
* Our test suite isn't ready to run in random order yet :cry:Guillermo Iguaran2014-05-161-0/+3
* flexible ruby-oci8 version specification. [Gaurav Sharma]Yves Senn2014-05-151-1/+1
* update ruby-oci8 version specification. Closes #15109. [ci skip]Yves Senn2014-05-151-1/+1
* Merge pull request #15108 from arthurnn/i18n_masterRafael Mendonça França2014-05-141-0/+1
|\
| * Use i18n master to run testsArthur Neves2014-05-131-0/+1
* | Update Redcarpet to 3.1.2Robin Dupret2014-05-141-1/+1
|/
* Guides: output valid HTML5Nate Berkopec2014-05-051-1/+1
* Add branch to arel on Gemfile to allow local bundle config [ci skip]Carlos Antonio da Silva2014-05-021-1/+1
* oops! Fix Gemfile. :bomb:Aaron Patterson2014-04-091-1/+2
* fix bind collecting for mysqlAaron Patterson2014-04-091-1/+0
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-091-0/+1
|\
| * depend_on_asset is not required anymore on sprockets-rails 2.1.2Rafael Mendonça França2014-04-091-0/+1
| * sprockets-rails was releasedRafael Mendonça França2014-04-041-1/+0
| * Make possible to use sprockets-rails 2.1Rafael Mendonça França2014-04-041-0/+1
* | working against arel/collector branchAaron Patterson2014-04-091-1/+1
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-261-1/+5
|\|
| * Bump version of bcrypt gemT.J. Schuck2014-02-251-1/+5
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-171-6/+1
|\|
| * Update Travis settings for RubiniusErik Michaels-Ober2014-02-121-5/+0
| * Upgraded jquery-rails gem versionUday Kadaboina2014-02-031-1/+1
* | use edge arelAaron Patterson2014-01-151-0/+1
|/
* upgrade SDocXavier Noria2014-01-121-1/+1
* Only build a ConnectionSpecification if requiredJosé Valim2013-12-241-3/+3
* Use the released arel gemRafael Mendonça França2013-12-051-1/+0
* Dropped yajl from GemfileGodfrey Chan2013-11-261-1/+0
* Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
* Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-241-4/+2
* use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-191-1/+1
* use `4-0-stable` arel branch to get bundle working again.Yves Senn2013-11-191-1/+1
* Set branch for arel in Gemfile so that we can use bundle local config [ci skip]Carlos Antonio da Silva2013-11-141-1/+1