Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/symfony
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bca31e4
Choose a base ref
...
head repository: symfony/symfony
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ab3693
Choose a head ref
  • 16 commits
  • 7 files changed
  • 4 contributors

Commits on Jul 3, 2017

  1. updated CHANGELOG for 2.7.30

    @fabpot
    fabpot committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    400e767 View commit details
    Browse the repository at this point in the history

  2. update CONTRIBUTORS for 2.7.30

    @fabpot
    fabpot committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    e688bdc View commit details
    Browse the repository at this point in the history

  3. updated VERSION for 2.7.30

    @fabpot
    fabpot committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    75443d2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #23361 from fabpot/release-2.7.30 

    released v2.7.30
    @fabpot
    fabpot authored Jul 3, 2017
    Configuration menu
    Copy the full SHA
    90fa8a8 View commit details
    Browse the repository at this point in the history

  5. bumped Symfony version to 2.7.31

    @fabpot
    fabpot committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    fa6b45b View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. bumped Symfony version to 2.8.24

    @fabpot
    fabpot committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    d011d57 View commit details
    Browse the repository at this point in the history

  2. [FrameworkBundle] Do not remove files from assets dir

    @1ed
    1ed committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    6ed9c8d View commit details
    Browse the repository at this point in the history

  3. bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed) 

    This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Do not remove files from assets dir

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

The patch introduced in #23195 removes files from `web/bundles` (eg. `.gitignore`) which is unintentional I think.

Commits
-------

6ed9c8d [FrameworkBundle] Do not remove files from assets dir
    @fabpot
    fabpot committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    6298e69 View commit details
    Browse the repository at this point in the history

  4. Fix indent of methods

    @keradus
    keradus committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    58ba481 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2017

  1. Merge branch '2.7' into 2.8 

    * 2.7:
  [FrameworkBundle] Do not remove files from assets dir
  bumped Symfony version to 2.7.31
  updated VERSION for 2.7.30
  update CONTRIBUTORS for 2.7.30
  updated CHANGELOG for 2.7.30
    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    ecaae23 View commit details
    Browse the repository at this point in the history

  2. fixed bad merge

    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    d879eed View commit details
    Browse the repository at this point in the history

  3. minor #23395 Fix indent of methods (keradus) 

    This PR was merged into the 2.7 branch.

Discussion
----------

Fix indent of methods

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

58ba481 Fix indent of methods
    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    139e3ea View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.7' into 2.8 

    * 2.7:
  Fix indent of methods
    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    442058d View commit details
    Browse the repository at this point in the history

  5. updated CHANGELOG for 2.8.24

    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    09797de View commit details
    Browse the repository at this point in the history

  6. updated VERSION for 2.8.24

    @fabpot
    fabpot committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    bf1be0e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #23401 from fabpot/release-2.8.24 

    released v2.8.24
    @fabpot
    fabpot authored Jul 5, 2017
    Configuration menu
    Copy the full SHA
    0ab3693 View commit details
    Browse the repository at this point in the history
Loading