Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: andhapp/rails
...
head fork: andhapp/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 28, 2011
@omjokine omjokine Change mimetype to Mime::JS if JSONP is used 6b15a45
@omjokine omjokine fixed test case test_render_json_with_callback to use content_type ap…
…plication/javascript
fae9ad9
Commits on Dec 01, 2011
@omjokine omjokine Merge remote-tracking branch 'upstream/master' b4e1903
Commits on Apr 28, 2012
Adam Hawkins Add a "silence" behavior to completely turn off deprecation warnings. 76cd1ca
twinturbo Document #behavior= and update CHANGELOG 9608395
@carlosantoniodasilva carlosantoniodasilva Add test for default silence and stderr deprecation behaviors 34599c4
@pixeltrix pixeltrix Merge session arg with existing session instead of overwriting
This may break existing tests that are asserting the whole session contents
but should not break existing tests that are asserting individual keys - e.g:

class SomeControllerTest < ActionController::TestCase
  setup do
    session['user_id'] = 1
  end

  test "some test" do
    get :some_action, nil, { 'another_var' => 2 }

    # This assertion will now fail
    assert_equal({ 'another_var' => 2 }, session)

    # This assertion will still pass
    assert_equal 2, session['another_var]
  end
end

Fixes #1529.
5c18bdc
@drogus drogus Add a failing test for #5764 28844ae
@romanvbabenko romanvbabenko Engine#routes? method has been fixed d9239fd
@drogus drogus Fix Engine#routes to not call draw_paths multiple times 5a2fdaa
@drogus drogus Don't create new directory for tests 1823d53
tomhuda Allow Thor 0.15 and 1.0, to be released shortly ad2c5ea
@gazay gazay AS core_ext refactoring 1946d7b
@gazay gazay AS core_ext refactoring pt.2 9257224
@gazay gazay Indentation for private methods f122051
@gazay gazay String quotes and trailing spaces 432a65f
Commits on Apr 29, 2012
@jeremy jeremy Merge pull request #5996 from gazay/remove_excess_selfs
Active Support housekeeping and polish
1a4e27f
@drogus drogus Lazy load `default_form_builder` if it's passed as a string
closes #3341
e6ab0d5
@josevalim josevalim Merge pull request #2321 from omjokine/master
JSONP should use mimetype application/javascript
d4dd1af
@josevalim josevalim Avoid calling content type multiple times e73f547
@josevalim josevalim Merge pull request #5986 from carlosantoniodasilva/deprecation-behavi…
…or-silence

Add a "silence" behavior to completely turn off deprecation warnings.
ffc861c
@pixeltrix pixeltrix Don't convert params if the request isn't HTML - fixes #5341 7a80b69
@gazay gazay Tests for regexp separator in String#truncate 0765364
@josevalim josevalim Merge pull request #6044 from gazay/tests_for_string_truncate_w_regex…
…p_separator

Tests for regexp separator in String#truncate
0b019cc
@vijaydev vijaydev Removed unclear doc in AR querying guide [ci skip]
The range example used in array conditions is unclear and talks about
the old 'conditions' option. Closes #4943.
6bea191