Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2-1-stable to master #265

Merged
merged 15 commits into from
May 24, 2014
Merged

merge 2-1-stable to master #265

merged 15 commits into from
May 24, 2014

Commits on Dec 22, 2013

  1. Configuration menu
    Copy the full SHA
    2cb3bfa View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2014

  1. Configuration menu
    Copy the full SHA
    6d0eee5 View commit details
    Browse the repository at this point in the history
  2. add rubysl to the gem file for rbx/rvm travis-ci issue

    Conflicts:
    	Gemfile
    Shevaun Coker authored and parndt committed Jan 20, 2014
    Configuration menu
    Copy the full SHA
    cc7d0f7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #224 from rathgar/2-1-stable

    Optionally touch all ancestors on save
    parndt committed Jan 20, 2014
    Configuration menu
    Copy the full SHA
    6316ade View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d5a0383 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3d5ac74 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2014

  1. 2-1-stable: fix deleting a parent may lead to a stale object error

    Redmine Defect 7920
    Attempted to update a stale object when copying a project
    http:https://www.redmine.org/issues/7920
    
    This revision passes Redmine test.
    http:https://www.redmine.org/projects/redmine/repository/entry/trunk/test/unit/issue_nested_set_test.rb?rev=12679#L244
    
    https://travis-ci.org/marutosi/redmine/jobs/17215987#L1979
    
    <pre>
      1) Error:
    test_destroy_parent_issue_updated_during_children_destroy(IssueNestedSetTest):
    ActiveRecord::StaleObjectError: Attempted to destroy a stale object: Issue
        app/models/issue.rb:179:in `destroy'
        test/unit/issue_nested_set_test.rb:250:in `test_destroy_parent_issue_updated_during_children_destroy'
        test/unit/issue_nested_set_test.rb:249:in `test_destroy_parent_issue_updated_during_children_destroy'
    </pre>
    marutosi committed Jan 24, 2014
    Configuration menu
    Copy the full SHA
    5531b9b View commit details
    Browse the repository at this point in the history
  2. 2-1-stable: fix ActiveRecord::StatementInvalid: Error: Column 'lft' i…

    …n order clause is ambiguous
    
    On 2-1-stable 3d5ac74, Redmine test fails.
    https://bitbucket.org/marutosi/redmine-bb-awesome_nested_set-use-gem/src/2ac1078370/Gemfile#cl-10
    https://drone.io/bitbucket.org/marutosi/redmine-bb-awesome_nested_set-use-gem/2
    
    <pre>
     13) Error:
        test_visible_and_nested_set_scopes(IssueTest):
        ActiveRecord::StatementInvalid: Mysql2::Error: Column 'lft' in order clause is ambiguous:
    </pre>
    
    http:https://www.redmine.org/projects/redmine/repository/revisions/12689/annotate/trunk/test/unit/issue_test.rb#L332
    <pre>
      def test_visible_and_nested_set_scopes
        assert_equal 0, Issue.find(1).descendants.visible.all.size
      end
    </pre>
    marutosi committed Jan 24, 2014
    Configuration menu
    Copy the full SHA
    d34770b View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2014

  1. Fix for mssql with jruby/activerecord-jdbc-adapter

    Fix for the following error with mssql with jruby/activerecord-jdbc-adapter:
    ActiveRecord::StatementInvalid: ActiveRecord::JDBCError: No column was specified for column 3 of 't'.: SELECT t.* FROM ( SELECT ROW_NUMBER() OVER(ORDER BY MIN(users.id)) AS _row_num, [users].[lft], COUNT([users].[lft]) FROM [users]  GROUP BY [users].[lft] HAVING COUNT([users].[lft]) > 1 ) AS t WHERE t._row_num BETWEEN 1 AND 1
    soemo committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    91f7d30 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2014

  1. updated_at is changed on move.

    Conflicts:
    	lib/awesome_nested_set/move.rb
    nagyt234 authored and parndt committed Apr 27, 2014
    Configuration menu
    Copy the full SHA
    4f718b7 View commit details
    Browse the repository at this point in the history
  2. Refactored conditions logic to include updated_at

    Conflicts:
    	lib/awesome_nested_set/move.rb
    parndt committed Apr 27, 2014
    Configuration menu
    Copy the full SHA
    b0b4fcc View commit details
    Browse the repository at this point in the history
  3. Merge pull request #234 from marutosi/2-1-stable-fix-stale-object-error

    2-1-stable: fix deleting a parent may lead to a stale object error
    parndt committed Apr 27, 2014
    Configuration menu
    Copy the full SHA
    b500b08 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #235 from marutosi/2-1-stable-fix-order

    2-1-stable: fix ActiveRecord::StatementInvalid: Error: Column 'lft' in order clause is ambiguous
    parndt committed Apr 27, 2014
    Configuration menu
    Copy the full SHA
    89aaf30 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #236 from soemo/2-1-stable

    Fix for mssql with jruby/activerecord-jdbc-adapter
    parndt committed Apr 27, 2014
    Configuration menu
    Copy the full SHA
    8eaab19 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2014

  1. merge 2-1-stable to master

    marutosi committed May 24, 2014
    Configuration menu
    Copy the full SHA
    46c65f5 View commit details
    Browse the repository at this point in the history