[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 695464: Ignore composer.lock from git

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 695464de8a7d72d62ce6adc9ec44a30170468d32
      https://github.com/phpmyadmin/phpmyadmin/commit/695464de8a7d72d62ce6adc9ec44a30170468d32
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Ignore composer.lock from git

Issue #13346

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: bbf5ca915690dfe5e78d285527a3eb8f9d2a16e9
      https://github.com/phpmyadmin/phpmyadmin/commit/bbf5ca915690dfe5e78d285527a3eb8f9d2a16e9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Log Message:
  -----------
  Merge branch 'QA_4_7'


  Commit: c4380018a71424de4e5c2ebe026d135e2af4c8d3
      https://github.com/phpmyadmin/phpmyadmin/commit/c4380018a71424de4e5c2ebe026d135e2af4c8d3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Avoid .gitignore modification when commiting composer.lock

With --force we can add files which would be ignored.

Issue #13346

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 87fd00915ab102914bf985238209e90db1a7663a
      https://github.com/phpmyadmin/phpmyadmin/commit/87fd00915ab102914bf985238209e90db1a7663a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Remove composer.lock after tagging release

We really want this file only on tags and not elsewhere.

Fixes #13346

Signed-off-by: Michal Čihař <michal at cihar.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b2ddd0c14ae2...87fd00915ab1