github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-15 01:28:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,234 Commits 34 Branches 105 Tags
github26
Commit Graph

10234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlie Somerville
c0dbd4d501 Use Ruby 2.0.0 in CI 2013-08-08 20:37:30 -07:00
Charlie Somerville
64f1090b56 take ruby version into account in homemade bundler 2013-08-08 20:36:05 -07:00
Greg Ose
6668f3d858 Backport authenticity_token parameter for form_for 
Allow authenticity token to be omitted for external requests
 2013-08-08 16:17:09 -05:00
Charlie Somerville
198d1720a0 Merge pull request #9 from github/green-baseline 
Add script/cibuild
 2013-08-07 00:55:23 -07:00
Charlie Somerville
e423b0095f fix broken tests and warnings 2013-08-07 00:46:51 -07:00
Charlie Somerville
7ab460b10d delete actionmailer tests 2013-08-07 00:25:30 -07:00
Charlie Somerville
7f93fa6ddc oops 2013-08-07 00:08:51 -07:00
Charlie Somerville
c2e20b0786 install erubis 2013-08-07 00:06:27 -07:00
Charlie Somerville
c78f87cec4 install rack too 2013-08-07 00:03:36 -07:00
Charlie Somerville
3f416f3a54 remove obsoleted usage of URI.unescape 2013-08-07 00:02:27 -07:00
Charlie Somerville
087bdaf5f8 don't run AR tests for non-sqlite3 2013-08-06 23:53:35 -07:00
Charlie Somerville
2b02d0daf7 install sqlite3 2013-08-06 23:50:53 -07:00
Charlie Somerville
5e079feafa whoops 2013-08-06 23:49:30 -07:00
Charlie Somerville
b5b36fcf2f sigh 2013-08-06 23:46:11 -07:00
Charlie Somerville
a169838ab7 god damn rbenv 2013-08-06 23:37:28 -07:00
Charlie Somerville
90f3061c41 exit with failure status if tests fail 2013-08-06 23:33:17 -07:00
Charlie Somerville
34745176af add cibuild script and Gemfile.sh 2013-08-06 23:15:30 -07:00
Charlie Somerville
581ed6ab6e fix AR tests 2013-08-06 19:40:44 -07:00
Charlie Somerville
117eeefb76 fix invalid YAML 2013-08-06 17:50:56 -07:00
Charlie Somerville
4299e71018 fix some AR tests on 1.9 2013-08-06 17:41:51 -07:00
Charlie Somerville
06d4ca0254 establish a baseline by skipping all tests failing before 2.0.0 2013-08-06 17:41:45 -07:00
Charlie Somerville
bb5437286a fix respond_to? bug on ruby 2.0 2013-08-06 03:57:59 -07:00
Jeremy McAnally
18a926b11b Don't ever undefine object_id 2013-03-28 16:00:49 -04:00
Jeremy McAnally
a71a160bc2 Merge pull request #6 from github/fix-builder-19-issue 
Update blankslate.rb to play nicer in Ruby 1.9
 2013-03-28 12:50:56 -07:00
Jeremy McAnally
c474fc130c Kill the whitespace 2013-03-28 15:24:54 -04:00
Jeremy McAnally
dbfac55a3c Make it 1.8 compatible and slightly faster 2013-03-28 14:59:21 -04:00
Jeremy McAnally
80964e83eb Update blankslate.rb to play nicer in Ruby 1.9 
Currently, blankslate causes bugs and quirks since `instance_methods` 
returns symbols on Ruby 1.9.  This patch fixes that.
 2013-03-28 15:23:38 -03:00
Nicolás Sanguinetti
88384457ee Merge pull request #5 from github/fix-sanitize 
fix protocol checking in sanitization [CVE-2013-1857]
 2013-03-18 11:16:18 -07:00
Aaron Patterson
37ea897a44 fix protocol checking in sanitization [CVE-2013-1857] 
Conflicts:
	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
	actionpack/test/controller/html-scanner/sanitizer_test.rb
 2013-03-18 15:01:49 -03:00
Aman Gupta
55d463eeea merge routing_tricks plugin for subdomain routing 2013-03-05 17:21:59 -08:00
Aman Gupta
5f847d2fa7 fix default to_a deprecation warnings 
lib/active_record/associations/association_proxy.rb:215: warning: default `to_a' will be obsolete
 2013-03-01 18:03:08 -08:00
Aman Gupta
e4652359c3 fix regression on ruby 1.8 /cc github/rails#4 2013-03-01 17:45:22 -08:00
Aman Gupta
a03cb40ce5 Merge pull request #4 from github/association-fix 
Ruby 2.0 compat
 2013-03-01 17:06:55 -08:00
Aman Gupta
9ab900156d fix for ruby 2.0 
this was manifesting as:

  NoMethodError: undefined method `insert_record' for #<Array:0x007fb0ca5fa7f8>
      gems/activerecord-2.3.14.github17/lib/active_record/associations/association_proxy.rb:149:in `send'

see http://tenderlovemaking.com/2012/09/07/protected-methods-and-ruby-2-0.html
 2013-03-01 17:02:58 -08:00
Aman Gupta
c6bbe648e8 whitespace 2013-03-01 17:02:10 -08:00
Aaron Patterson
dc6f44fae6 just use return value of load_target 2013-03-01 17:02:10 -08:00
Aaron Patterson
76e373c559 just call methods on return value of load_target 2013-03-01 17:02:06 -08:00
Aaron Patterson
1d8013e2ce @loaded is defined in initialize, so we should not need this 
Conflicts:
	activerecord/lib/active_record/associations/association_proxy.rb
 2013-03-01 17:01:29 -08:00
sblackstone
cb312a2e76 Association Proxy should not undefine the default respond_to_missing 
Conflicts:
	activerecord/lib/active_record/associations/association_proxy.rb
 2013-02-28 18:56:30 -08:00
Aman Gupta
e7be98f40c Revert "fix multiple queries when chaining named scopes" 
This reverts commit d43ecd5b32.
 2013-02-28 18:50:26 -08:00
Aman Gupta
d8f1980343 remove tmail 2013-02-28 18:49:27 -08:00
Aman Gupta
76d83c0d5c use OutputBuffer#safe_append= for <%== to avoid extra string allocations 2013-02-26 01:07:29 -08:00
Aman Gupta
7335865bd9 avoid method call 2013-02-26 01:06:36 -08:00
Aman Gupta
e43316238d flush whitespace before statements to preserve line numbers 2013-02-25 22:13:11 -08:00
Aman Gupta
c3c6f25ec7 Merge pull request #3 from github/no-escape_once 
XSS escaping
 2013-02-24 21:47:24 -08:00
Aman Gupta
331461a65e optimize generated erb to reduce method calls 
before:

        ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('        ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="content">
        ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="message">
');

after:

        ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append='
        ';@output_buffer.append=( spinner_img );@output_buffer.safe_append='
      </td>
      <td class="content">
        ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append='
      </td>
      <td class="message">
';
 2013-02-22 02:56:17 -08:00
Aman Gupta
fd05501b4d ActionView::OutputBuffer and Erubis handler from rails 3.2 2013-02-21 06:03:01 -08:00
Aman Gupta
0fa76e01de ActiveSupport::SafeBuffer from upstream rails 3.2 2013-02-21 04:54:58 -08:00
Aman Gupta
1c215bab58 integrate monkey-patches from rails_xss/action_view 2013-02-21 03:20:01 -08:00
Aman Gupta
c7238a0746 faster html escaping code from rails master 2013-02-21 02:44:37 -08:00