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: 90fa8a8
Choose a base ref
...
head repository: symfony/symfony
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7157a5e
Choose a head ref
  • 9 commits
  • 6 files changed
  • 4 contributors

Commits on Jul 3, 2017

  1. 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. [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

  2. 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

  3. 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. 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

  2. updated CHANGELOG for 2.7.31

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

  3. update CONTRIBUTORS for 2.7.31

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

  4. updated VERSION for 2.7.31

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

  5. Merge pull request #23397 from fabpot/release-2.7.31 

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