prompt
stringlengths
77
6.9k
completion
stringlengths
1
3.38k
text
stringlengths
163
9.03k
commit
stringlengths
40
40
old_file
stringlengths
4
264
new_file
stringlengths
4
264
lang
stringclasses
277 values
<|file_sep|>original/generators/app/templates/theme/default.twig {% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutter"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %} <|file_sep|>current/generators/app/templates/theme/default.twig {% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutter"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %} <|file_sep|>updated/generators/app/templates/theme/default.twig
{% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutterXlg"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %}
<|file_sep|>original/generators/app/templates/theme/default.twig {% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutter"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %} <|file_sep|>current/generators/app/templates/theme/default.twig {% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutter"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %} <|file_sep|>updated/generators/app/templates/theme/default.twig {% include 'snippets/header' %} <div class="Container"> {% if _page.isHome == false %} {{ _page.breadcrumb }} {% endif %} <div class="Content"> <div class="Grid Grid--withGutterXlg"> <div class="Grid-cell u-size3of4 u-md-sizeFull u-push1of4 u-md-pushNone"> {{ _page.content() }} </div> <div class="Grid-cell u-size1of4 u-md-sizeFull u-pull3of4 u-md-pullNone"> {{ _api.navigation.getSubNavigationByUrl.key('main').getParentItem('yes').showSubNav('yes').template('sidebar') }} </div> </div> </div> </div> {% include 'snippets/footer' %}
ef6cf601853aad93f226749a9c00ec78c08a8fe1
generators/app/templates/theme/default.twig
generators/app/templates/theme/default.twig
Twig
<|file_sep|>original/index.html <meta charset='utf-8'> <meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1>There is nothing here for now, sorry...</h1> </div> </header> </body> </html> <|file_sep|>current/index.html <meta charset='utf-8'> <meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1>There is nothing here for now, sorry...</h1> </div> </header> </body> </html> <|file_sep|>updated/index.html
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1><a href="guess-russia-regions">guess-russia-regions</a></h1> <h1><a href="zij.html">zij</a></h1> </div> </header> </body> </html>
<|file_sep|>original/index.html <meta charset='utf-8'> <meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1>There is nothing here for now, sorry...</h1> </div> </header> </body> </html> <|file_sep|>current/index.html <meta charset='utf-8'> <meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1>There is nothing here for now, sorry...</h1> </div> </header> </body> </html> <|file_sep|>updated/index.html <meta http-equiv="X-UA-Compatible" content="chrome=1"> <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/pygment_trac.css" media="screen" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> <title>koluch.ru at Github Pages by koluch</title> </head> <body> <header> <div class="container"> <h1><a href="guess-russia-regions">guess-russia-regions</a></h1> <h1><a href="zij.html">zij</a></h1> </div> </header> </body> </html>
e9ba47bedfbf910143c54c9f073fea078dd5fc11
index.html
index.html
HTML
<|file_sep|>LICENSE.md.diff original: **Copyright &copy; 2004-2016, CherryPy Team (team@cherrypy.org)** updated: Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) <|file_sep|>original/LICENSE.md **Copyright &copy; 2004-2016, CherryPy Team (team@cherrypy.org)** **All rights reserved.** * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" <|file_sep|>current/LICENSE.md Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) **All rights reserved.** * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" <|file_sep|>updated/LICENSE.md
Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) All rights reserved. * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
<|file_sep|>LICENSE.md.diff original: **Copyright &copy; 2004-2016, CherryPy Team (team@cherrypy.org)** updated: Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) <|file_sep|>original/LICENSE.md **Copyright &copy; 2004-2016, CherryPy Team (team@cherrypy.org)** **All rights reserved.** * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" <|file_sep|>current/LICENSE.md Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) **All rights reserved.** * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" <|file_sep|>updated/LICENSE.md Copyright © 2004-2018, CherryPy Team (team@cherrypy.org) All rights reserved. * * * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of CherryPy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3f4bcdb6c8afd52ded15f94ef6cb9753cdff6d01
LICENSE.md
LICENSE.md
Markdown
<|file_sep|>original/requirements.txt # Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.6 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 <|file_sep|>current/requirements.txt # Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.6 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 <|file_sep|>updated/requirements.txt
# Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.8.0 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0
<|file_sep|>original/requirements.txt # Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.6 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 <|file_sep|>current/requirements.txt # Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.6 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 <|file_sep|>updated/requirements.txt # Minimum Django version Django>=1.4.11 # Test requirements pytest-django==2.8.0 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0
7c0d14a6d56a0813a8abf6da53622c323a77bca8
requirements.txt
requirements.txt
Text
<|file_sep|>original/readme.md ## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/mdunicorn/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock. <|file_sep|>current/readme.md ## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/mdunicorn/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock. <|file_sep|>updated/readme.md
## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/prodehghan/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock.
<|file_sep|>original/readme.md ## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/mdunicorn/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock. <|file_sep|>current/readme.md ## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/mdunicorn/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock. <|file_sep|>updated/readme.md ## Brief Introduction to C++ Standard Template Library I wrote this guide for my classmates in the University of Tabriz, in August 2005. It is in Persian. ## Download [Here is the *.chm* file](https://github.com/prodehghan/STL/releases/download/v1.0/STL.chm). Don't forget to unblock the file after downloading, or it will not show anything. Right click on *STL.chm* file and click Properties, then click Unblock.
ec85f0e9a818da703ef5e11eb6f7f42907f7673e
readme.md
readme.md
Markdown
<|file_sep|>original/packages/fi/finitary-optics.yaml <|file_sep|>current/packages/fi/finitary-optics.yaml <|file_sep|>updated/packages/fi/finitary-optics.yaml
homepage: https://notabug.org/koz.ross/finitary-optics changelog-type: markdown hash: f198afd859f3f6995e77377787ab28c8baccc039b41f8c88678603d28fb5d562 test-bench-deps: optics-core: -any base: -any hspec: ^>=2.7.1 hedgehog: ^>=1.0.2 hspec-hedgehog: ^>=0.0.1.2 finitary-optics: -any maintainer: koz.ross@retro-freedom.nz synopsis: Prisms and Isos between finitary types. changelog: | # Revision history for finitary-optics ## 1.0.0.0 -- 2020-06-05 * First version. Released on an unsuspecting world. basic-deps: optics-core: ^>=0.3 base: '>=4.12 && <5'
<|file_sep|>original/packages/fi/finitary-optics.yaml <|file_sep|>current/packages/fi/finitary-optics.yaml <|file_sep|>updated/packages/fi/finitary-optics.yaml homepage: https://notabug.org/koz.ross/finitary-optics changelog-type: markdown hash: f198afd859f3f6995e77377787ab28c8baccc039b41f8c88678603d28fb5d562 test-bench-deps: optics-core: -any base: -any hspec: ^>=2.7.1 hedgehog: ^>=1.0.2 hspec-hedgehog: ^>=0.0.1.2 finitary-optics: -any maintainer: koz.ross@retro-freedom.nz synopsis: Prisms and Isos between finitary types. changelog: | # Revision history for finitary-optics ## 1.0.0.0 -- 2020-06-05 * First version. Released on an unsuspecting world. basic-deps: optics-core: ^>=0.3 base: '>=4.12 && <5'
13ab5dd6640b2fa5dc01261620257c428748515a
packages/fi/finitary-optics.yaml
packages/fi/finitary-optics.yaml
YAML
<|file_sep|>original/.travis.yml language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.0 - 2.4.3 - 2.3.6 - 2.2.9 <|file_sep|>current/.travis.yml language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.0 - 2.4.3 - 2.3.6 - 2.2.9 <|file_sep|>updated/.travis.yml
language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.1 - 2.4.4 - 2.3.7 - 2.2.10
<|file_sep|>original/.travis.yml language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.0 - 2.4.3 - 2.3.6 - 2.2.9 <|file_sep|>current/.travis.yml language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.0 - 2.4.3 - 2.3.6 - 2.2.9 <|file_sep|>updated/.travis.yml language: ruby cache: bundler before_install: # Workaround for https://github.com/travis-ci/travis-ci/issues/8969 - gem update --system rvm: - 2.5.1 - 2.4.4 - 2.3.7 - 2.2.10
90d0cdb7751da83ec174d783391693cb6dd56109
.travis.yml
.travis.yml
YAML
<|file_sep|>original/package.json ], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^5.2.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } } <|file_sep|>current/package.json ], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^5.2.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } } <|file_sep|>updated/package.json
], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^6.0.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } }
<|file_sep|>original/package.json ], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^5.2.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } } <|file_sep|>current/package.json ], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^5.2.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } } <|file_sep|>updated/package.json ], "author": "", "license": "ISC", "devDependencies": { "eslint": "^5.6.1", "eslint-config-pretty-standard": "^2.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-prettier": "^3.0.0", "jest": "^24.0.0", "jsdom": "^13.0.0", "mocha": "^6.0.0", "prettier": "^1.14.3", "rimraf": "^2.6.2", "unexpected": "^11.0.0", "whatwg-fetch": "^3.0.0" }, "dependencies": { "messy": "^6.16.0", "unexpected-messy": "^8.1.0" } }
87777b6f8cfb0d1d4ccffc802c71c007a13eb1d7
package.json
package.json
JSON
<|file_sep|>original/requirements/base.txt sqlalchemy==1.2.7 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5 <|file_sep|>current/requirements/base.txt sqlalchemy==1.2.7 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5 <|file_sep|>updated/requirements/base.txt
sqlalchemy==1.2.8 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5
<|file_sep|>original/requirements/base.txt sqlalchemy==1.2.7 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5 <|file_sep|>current/requirements/base.txt sqlalchemy==1.2.7 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5 <|file_sep|>updated/requirements/base.txt sqlalchemy==1.2.8 kaptan==0.5.9 colorama==0.3.9 appdirs==1.4.3 unihan-etl==0.9.5
347d451f23ba23318f77ad124c77e856536c58fc
requirements/base.txt
requirements/base.txt
Text
<|file_sep|>citrination_client/views/descriptors/real_descriptor.py.diff original: def __init__(self, key, lower_bound="-Infinity", upper_bound="Infinity", units=""): updated: def __init__(self, key, lower_bound, upper_bound, units=""): <|file_sep|>citrination_client/views/descriptors/real_descriptor.py.diff original: lower = float(str(raw_lower).replace("Infinity", "inf")) upper = float(str(raw_upper).replace("Infinity", "inf")) updated: lower = float(str(raw_lower)) upper = float(str(raw_upper)) <|file_sep|>original/citrination_client/views/descriptors/real_descriptor.py class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound="-Infinity", upper_bound="Infinity", units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower).replace("Infinity", "inf")) upper = float(str(raw_upper).replace("Infinity", "inf")) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats (or Infinity/-Infinity) but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper)) <|file_sep|>current/citrination_client/views/descriptors/real_descriptor.py class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound, upper_bound, units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower)) upper = float(str(raw_upper)) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats (or Infinity/-Infinity) but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper)) <|file_sep|>updated/citrination_client/views/descriptors/real_descriptor.py
class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound, upper_bound, units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower)) upper = float(str(raw_upper)) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper))
<|file_sep|>citrination_client/views/descriptors/real_descriptor.py.diff original: def __init__(self, key, lower_bound="-Infinity", upper_bound="Infinity", units=""): updated: def __init__(self, key, lower_bound, upper_bound, units=""): <|file_sep|>citrination_client/views/descriptors/real_descriptor.py.diff original: lower = float(str(raw_lower).replace("Infinity", "inf")) upper = float(str(raw_upper).replace("Infinity", "inf")) updated: lower = float(str(raw_lower)) upper = float(str(raw_upper)) <|file_sep|>original/citrination_client/views/descriptors/real_descriptor.py class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound="-Infinity", upper_bound="Infinity", units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower).replace("Infinity", "inf")) upper = float(str(raw_upper).replace("Infinity", "inf")) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats (or Infinity/-Infinity) but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper)) <|file_sep|>current/citrination_client/views/descriptors/real_descriptor.py class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound, upper_bound, units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower)) upper = float(str(raw_upper)) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats (or Infinity/-Infinity) but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper)) <|file_sep|>updated/citrination_client/views/descriptors/real_descriptor.py class RealDescriptor(MaterialDescriptor): def __init__(self, key, lower_bound, upper_bound, units=""): self.options = dict(lower_bound=lower_bound, upper_bound=upper_bound, units=units) super(RealDescriptor, self).__init__(key, "Real") def validate(self): raw_lower = self.options["lower_bound"] raw_upper = self.options["upper_bound"] try: lower = float(str(raw_lower)) upper = float(str(raw_upper)) except ValueError: raise ValueError( "lower_bound and upper_bound must be floats but got {} and {} respectively".format( raw_lower, raw_upper) ) if lower > upper: raise ValueError("Lower ({}) must be smaller than upper ({})".format(lower, upper))
9ff4f1e64f8d8208bfe83ed497fa280febcf5ce7
citrination_client/views/descriptors/real_descriptor.py
citrination_client/views/descriptors/real_descriptor.py
Python
<|file_sep|>original/.github/workflows/ci.yml on: push: branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 <|file_sep|>current/.github/workflows/ci.yml on: push: branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 <|file_sep|>updated/.github/workflows/ci.yml
branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 - name: Run tests run: vendor/bin/phpunit --configuration phpunit.xml tests
<|file_sep|>original/.github/workflows/ci.yml on: push: branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 <|file_sep|>current/.github/workflows/ci.yml on: push: branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 <|file_sep|>updated/.github/workflows/ci.yml branches: [ '*' ] pull_request: branches: [ '*' ] jobs: build: runs-on: ubuntu-latest strategy: matrix: php-versions: [ '7.4', '8.0', '8.1' ] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit:7.5.5 - name: Run tests run: vendor/bin/phpunit --configuration phpunit.xml tests
baff154330e6d9ef796139a3366c98b4f9566522
.github/workflows/ci.yml
.github/workflows/ci.yml
YAML
<|file_sep|>original/.travis.yml language: java jdk: - oraclejdk7 script: - cd leanbean-api - mvn install -DskipTests=true - mvn test <|file_sep|>current/.travis.yml language: java jdk: - oraclejdk7 script: - cd leanbean-api - mvn install -DskipTests=true - mvn test <|file_sep|>updated/.travis.yml
language: java jdk: - oraclejdk7 before_script: - mysql -e 'create database leanbean_test;' script: - cd leanbean-api - mvn install -DskipTests=true - mvn test
<|file_sep|>original/.travis.yml language: java jdk: - oraclejdk7 script: - cd leanbean-api - mvn install -DskipTests=true - mvn test <|file_sep|>current/.travis.yml language: java jdk: - oraclejdk7 script: - cd leanbean-api - mvn install -DskipTests=true - mvn test <|file_sep|>updated/.travis.yml language: java jdk: - oraclejdk7 before_script: - mysql -e 'create database leanbean_test;' script: - cd leanbean-api - mvn install -DskipTests=true - mvn test
b5f00431fbda39ead7b8facc3d7a2f7af9068924
.travis.yml
.travis.yml
YAML
<|file_sep|>original/spec/game_spec.rb require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.instance_variable_get(:@ttt)).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do <|file_sep|>current/spec/game_spec.rb require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.instance_variable_get(:@ttt)).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do <|file_sep|>updated/spec/game_spec.rb
require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.gametype).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do
<|file_sep|>original/spec/game_spec.rb require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.instance_variable_get(:@ttt)).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do <|file_sep|>current/spec/game_spec.rb require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.instance_variable_get(:@ttt)).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do <|file_sep|>updated/spec/game_spec.rb require 'stringio' require './lib/game.rb' require './lib/tic_tac_toe.rb' describe Game do let(:ttt){TicTacToe.new} let(:new_game){Game.new(ttt)} describe '#initialize' do it 'with a new instance of TicTacToe' do expect(new_game.gametype).to eq(ttt) end end describe '#prompt_user_for_input' do it 'ask users to input the position on all available slots where they want to place an X' do expect(new_game.prompt_user_for_input).to eq("Enter a number 0, 1, 2, 3, 4, 5, 6, 7, 8 to place an X") end end describe '#get_user_input' do
31cdf60901d97e3dafef0b723201438cf44d93dc
spec/game_spec.rb
spec/game_spec.rb
Ruby
<|file_sep|>original/lib/tasks/sample_data.rake <|file_sep|>current/lib/tasks/sample_data.rake <|file_sep|>updated/lib/tasks/sample_data.rake
# For development populate the db with sample data # use: # rake db:reset # rake db:populate # rake test:prepare namespace :db do desc 'Fill database with sample data' task populate: :environment do User.create!(name: "Example User", email: "example@example.com", password: "foobar", password_confirmation: "foobar") 99.times do |n| name = Faker::Name.name email = "example-#{n+1}@example.com" password = "foobar_#{n}" User.create!(name: name, email: email, password: password,
<|file_sep|>original/lib/tasks/sample_data.rake <|file_sep|>current/lib/tasks/sample_data.rake <|file_sep|>updated/lib/tasks/sample_data.rake # For development populate the db with sample data # use: # rake db:reset # rake db:populate # rake test:prepare namespace :db do desc 'Fill database with sample data' task populate: :environment do User.create!(name: "Example User", email: "example@example.com", password: "foobar", password_confirmation: "foobar") 99.times do |n| name = Faker::Name.name email = "example-#{n+1}@example.com" password = "foobar_#{n}" User.create!(name: name, email: email, password: password,
f2e076369e90d14470cbafbb54446f2cda61ceda
lib/tasks/sample_data.rake
lib/tasks/sample_data.rake
Ruby
<|file_sep|>original/test/examples/ganttSideSpan.html <|file_sep|>current/test/examples/ganttSideSpan.html <|file_sep|>updated/test/examples/ganttSideSpan.html
<!DOCTYPE html> <html> <head> <meta charset="UTF-8"> <link rel="stylesheet" href="dist/mermaid.css"/> <script src="dist/mermaid.js"></script> <script> mermaid.initialize({ gantt: { leftPadding: 400 } }); </script> </head> <body> <div class="mermaid" id="i211"> gantt dateFormat YYYY-MM-DD title My Project
<|file_sep|>original/test/examples/ganttSideSpan.html <|file_sep|>current/test/examples/ganttSideSpan.html <|file_sep|>updated/test/examples/ganttSideSpan.html <!DOCTYPE html> <html> <head> <meta charset="UTF-8"> <link rel="stylesheet" href="dist/mermaid.css"/> <script src="dist/mermaid.js"></script> <script> mermaid.initialize({ gantt: { leftPadding: 400 } }); </script> </head> <body> <div class="mermaid" id="i211"> gantt dateFormat YYYY-MM-DD title My Project
e8be61e062e2d259d0ea3fcc1f72a998db23a727
test/examples/ganttSideSpan.html
test/examples/ganttSideSpan.html
HTML
<|file_sep|>original/.travis.yml sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh" <|file_sep|>current/.travis.yml sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh" <|file_sep|>updated/.travis.yml
sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5.1 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh"
<|file_sep|>original/.travis.yml sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh" <|file_sep|>current/.travis.yml sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh" <|file_sep|>updated/.travis.yml sudo: false language: java jdk: - oraclejdk8 env: global: - DITA_OT_VERSION=2.5.1 install: - ".travis/install.sh" script: - ".travis/publish.sh" after_success: - ".travis/deploy.sh"
e39c89edc24477572c359f63233541ebee27bf42
.travis.yml
.travis.yml
YAML
<|file_sep|>original/.circleci/config.yml # Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps: - checkout <|file_sep|>current/.circleci/config.yml # Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps: - checkout <|file_sep|>updated/.circleci/config.yml
# Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps:
<|file_sep|>original/.circleci/config.yml # Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps: - checkout <|file_sep|>current/.circleci/config.yml # Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps: - checkout <|file_sep|>updated/.circleci/config.yml # Python CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-python/ for more details # version: 2 jobs: build: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` - image: circleci/python:3.6.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 working_directory: ~/repo steps:
034f9a68079b7f45405988a3f9ea300f47338e77
.circleci/config.yml
.circleci/config.yml
YAML
<|file_sep|>original/_posts/2015-03-01-frida-2-0-2-released.markdown <|file_sep|>current/_posts/2015-03-01-frida-2-0-2-released.markdown <|file_sep|>updated/_posts/2015-03-01-frida-2-0-2-released.markdown
--- layout: news_item title: 'Frida 2.0.2 Released' date: 2015-03-01 11:00:00 +0100 author: oleavr version: 2.0.2 categories: [release] --- Thanks to your excellent feedback we just eliminated a crasher when using Frida on Windows with certain iOS device configurations. As this is a very important use-case we decided to do a hotfix release without any other changes. Please keep the bug-reports coming!
<|file_sep|>original/_posts/2015-03-01-frida-2-0-2-released.markdown <|file_sep|>current/_posts/2015-03-01-frida-2-0-2-released.markdown <|file_sep|>updated/_posts/2015-03-01-frida-2-0-2-released.markdown --- layout: news_item title: 'Frida 2.0.2 Released' date: 2015-03-01 11:00:00 +0100 author: oleavr version: 2.0.2 categories: [release] --- Thanks to your excellent feedback we just eliminated a crasher when using Frida on Windows with certain iOS device configurations. As this is a very important use-case we decided to do a hotfix release without any other changes. Please keep the bug-reports coming!
6845ecdd074db50b7f259aa679ccc9e668a09a83
_posts/2015-03-01-frida-2-0-2-released.markdown
_posts/2015-03-01-frida-2-0-2-released.markdown
Markdown
<|file_sep|>scripts/check-node-version.sh.diff original: if [[ $MAJOR -eq 0 && $MINOR -eq 10 ]]; then updated: if [[ $MAJOR -eq 6 ]]; then <|file_sep|>original/scripts/check-node-version.sh #!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 0 && $MINOR -eq 10 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 0.10.x" exit 1 fi <|file_sep|>current/scripts/check-node-version.sh #!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 6 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 0.10.x" exit 1 fi <|file_sep|>updated/scripts/check-node-version.sh
#!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 6 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 6" exit 1 fi
<|file_sep|>scripts/check-node-version.sh.diff original: if [[ $MAJOR -eq 0 && $MINOR -eq 10 ]]; then updated: if [[ $MAJOR -eq 6 ]]; then <|file_sep|>original/scripts/check-node-version.sh #!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 0 && $MINOR -eq 10 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 0.10.x" exit 1 fi <|file_sep|>current/scripts/check-node-version.sh #!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 6 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 0.10.x" exit 1 fi <|file_sep|>updated/scripts/check-node-version.sh #!/bin/bash VERSION=$(node --version | sed -e 's/^v//') while IFS=".", read MAJOR MINOR REVISION; do MISMATCH=1 if [[ $MAJOR -eq 6 ]]; then MISMATCH= fi done < <(echo $VERSION) if [[ -n "$MISMATCH" ]]; then echo "error: node version must be 6" exit 1 fi
ee2e1e554af24e3a61c2b962ad0e995433133833
scripts/check-node-version.sh
scripts/check-node-version.sh
Shell
<|file_sep|>original/helperscripts/dockercompose_runner.sh <|file_sep|>current/helperscripts/dockercompose_runner.sh <|file_sep|>updated/helperscripts/dockercompose_runner.sh
#!/bin/bash # remove old reports to prevent them from getting republished in case anything goes wrong rm -f permissions.html rm -f changes.html rm -f mailbody.html docker-compose build # create a plain old regular permissions report docker-compose run --name atlassian_permissions_run atlassian_permissions -S status.pickle --html -o permissions.html -u $username -p $password "$@" docker cp atlassian_permissions_run:/permissions.html ./permissions.html # if we have a previous state, produce a diff if [ -f ./status.pickle ]; then docker cp ./status.pickle atlassian_permissions:/oldstatus.pickle docker-compose run --name atlassian_permissions_run atlassian_permissions -L status.pickle -cmp oldstatus.pickle --html -o changes.html --diff docker cp atlassian_permissions_run:/changes.html ./changes.html cp changes.html mailbody.html # use change report for mail notification else cp permissions.html mailbody.html # no change report available, mail full permission report
<|file_sep|>original/helperscripts/dockercompose_runner.sh <|file_sep|>current/helperscripts/dockercompose_runner.sh <|file_sep|>updated/helperscripts/dockercompose_runner.sh #!/bin/bash # remove old reports to prevent them from getting republished in case anything goes wrong rm -f permissions.html rm -f changes.html rm -f mailbody.html docker-compose build # create a plain old regular permissions report docker-compose run --name atlassian_permissions_run atlassian_permissions -S status.pickle --html -o permissions.html -u $username -p $password "$@" docker cp atlassian_permissions_run:/permissions.html ./permissions.html # if we have a previous state, produce a diff if [ -f ./status.pickle ]; then docker cp ./status.pickle atlassian_permissions:/oldstatus.pickle docker-compose run --name atlassian_permissions_run atlassian_permissions -L status.pickle -cmp oldstatus.pickle --html -o changes.html --diff docker cp atlassian_permissions_run:/changes.html ./changes.html cp changes.html mailbody.html # use change report for mail notification else cp permissions.html mailbody.html # no change report available, mail full permission report
00b1d0332d500f4efcf0fad3b60e21f6ce1cfc67
helperscripts/dockercompose_runner.sh
helperscripts/dockercompose_runner.sh
Shell
<|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: source "http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb" checksum "507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47" notifies :run, "execute[run_install-nodejs]", :immediately updated: source 'http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb' checksum '507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47' notifies :run, 'execute[run_install-nodejs]', :immediately <|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: command "dpkg -i /tmp/nodejs.deb || apt-get -f install -y" user "root" updated: command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' <|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: bash 'Start ATMessager' do user 'vagrant' code <<-EOC cd /opt/nx/atmessager node app.js updated: bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm <|file_sep|>original/sandbox/dev/cookbooks/atmessager/recipes/default.rb remote_file '/tmp/nodejs.deb' do source "http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb" checksum "507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47" notifies :run, "execute[run_install-nodejs]", :immediately end execute 'run_install-nodejs' do command "dpkg -i /tmp/nodejs.deb || apt-get -f install -y" user "root" action :nothing end bash 'Start ATMessager' do user 'vagrant' code <<-EOC cd /opt/nx/atmessager node app.js EOC end <|file_sep|>current/sandbox/dev/cookbooks/atmessager/recipes/default.rb remote_file '/tmp/nodejs.deb' do source 'http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb' checksum '507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47' notifies :run, 'execute[run_install-nodejs]', :immediately end execute 'run_install-nodejs' do command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' action :nothing end bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm EOC end <|file_sep|>updated/sandbox/dev/cookbooks/atmessager/recipes/default.rb
execute 'run_install-nodejs' do command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' action :nothing end bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm EOC end bash 'Install forever' do user 'root' code <<-EOC npm install forever -g EOC end
<|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: source "http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb" checksum "507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47" notifies :run, "execute[run_install-nodejs]", :immediately updated: source 'http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb' checksum '507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47' notifies :run, 'execute[run_install-nodejs]', :immediately <|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: command "dpkg -i /tmp/nodejs.deb || apt-get -f install -y" user "root" updated: command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' <|file_sep|>sandbox/dev/cookbooks/atmessager/recipes/default.rb.diff original: bash 'Start ATMessager' do user 'vagrant' code <<-EOC cd /opt/nx/atmessager node app.js updated: bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm <|file_sep|>original/sandbox/dev/cookbooks/atmessager/recipes/default.rb remote_file '/tmp/nodejs.deb' do source "http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb" checksum "507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47" notifies :run, "execute[run_install-nodejs]", :immediately end execute 'run_install-nodejs' do command "dpkg -i /tmp/nodejs.deb || apt-get -f install -y" user "root" action :nothing end bash 'Start ATMessager' do user 'vagrant' code <<-EOC cd /opt/nx/atmessager node app.js EOC end <|file_sep|>current/sandbox/dev/cookbooks/atmessager/recipes/default.rb remote_file '/tmp/nodejs.deb' do source 'http://ppa.launchpad.net/chris-lea/node.js/ubuntu/pool/main/n/nodejs/nodejs_0.10.37-1chl1~trusty1_amd64.deb' checksum '507bd0f6c59e0652e609f72ca09abb984fdf3510d126aead78556be934577a47' notifies :run, 'execute[run_install-nodejs]', :immediately end execute 'run_install-nodejs' do command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' action :nothing end bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm EOC end <|file_sep|>updated/sandbox/dev/cookbooks/atmessager/recipes/default.rb execute 'run_install-nodejs' do command 'dpkg -i /tmp/nodejs.deb || apt-get -f install -y' user 'root' action :nothing end bash 'Create log folder' do not_if { ::File.exist?('/var/log/atm') } user 'root' code <<-EOC cd /var/log/ mkdir atm EOC end bash 'Install forever' do user 'root' code <<-EOC npm install forever -g EOC end
5e37116af10389878fe4c3c281602ed9e6483f30
sandbox/dev/cookbooks/atmessager/recipes/default.rb
sandbox/dev/cookbooks/atmessager/recipes/default.rb
Ruby
<|file_sep|>src/dataMigration.js.diff original: updated: // Get the current version we are upgrading from <|file_sep|>src/dataMigration.js.diff original: updated: // If no is version saved, it is from an early version, which can be represented as 0.0.0 <|file_sep|>src/dataMigration.js.diff original: updated: // Get the new version we are upgrading to <|file_sep|>src/dataMigration.js.diff original: if (fromVersion === toVersion) return; // Don't do anything if the version has not changed if (compareVersions(fromVersion, '1.0.30') < 0) { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on the 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true'); updated: // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); <|file_sep|>src/dataMigration.js.diff original: updated: // Record the new app version <|file_sep|>original/src/dataMigration.js import packageJson from '../package.json'; import compareVersions from 'semver-compare'; import { SETTINGS_KEYS } from './settings'; export function migrateDataToVersion(database, settings) { let fromVersion = settings.get(SETTINGS_KEYS.APP_VERSION); if (!fromVersion || fromVersion.length === 0) fromVersion = '0.0.0'; const toVersion = packageJson.version; if (fromVersion === toVersion) return; // Don't do anything if the version has not changed if (compareVersions(fromVersion, '1.0.30') < 0) { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on the 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true'); } settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } <|file_sep|>current/src/dataMigration.js import packageJson from '../package.json'; import compareVersions from 'semver-compare'; import { SETTINGS_KEYS } from './settings'; export function migrateDataToVersion(database, settings) { // Get the current version we are upgrading from let fromVersion = settings.get(SETTINGS_KEYS.APP_VERSION); // If no is version saved, it is from an early version, which can be represented as 0.0.0 if (!fromVersion || fromVersion.length === 0) fromVersion = '0.0.0'; // Get the new version we are upgrading to const toVersion = packageJson.version; // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); } // Record the new app version settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } <|file_sep|>updated/src/dataMigration.js
const toVersion = packageJson.version; // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); } // Record the new app version settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } // All data migration functions should be kept in this array, in sequential order. Each migration // needs a 'version' key, denoting the version that migration will migrate to, and a 'migrate' key, // which is a function taking the database and the settings and performs the migration const dataMigrations = [ { version: '1.0.30', migrate: (database, settings) => { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true');
<|file_sep|>src/dataMigration.js.diff original: updated: // Get the current version we are upgrading from <|file_sep|>src/dataMigration.js.diff original: updated: // If no is version saved, it is from an early version, which can be represented as 0.0.0 <|file_sep|>src/dataMigration.js.diff original: updated: // Get the new version we are upgrading to <|file_sep|>src/dataMigration.js.diff original: if (fromVersion === toVersion) return; // Don't do anything if the version has not changed if (compareVersions(fromVersion, '1.0.30') < 0) { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on the 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true'); updated: // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); <|file_sep|>src/dataMigration.js.diff original: updated: // Record the new app version <|file_sep|>original/src/dataMigration.js import packageJson from '../package.json'; import compareVersions from 'semver-compare'; import { SETTINGS_KEYS } from './settings'; export function migrateDataToVersion(database, settings) { let fromVersion = settings.get(SETTINGS_KEYS.APP_VERSION); if (!fromVersion || fromVersion.length === 0) fromVersion = '0.0.0'; const toVersion = packageJson.version; if (fromVersion === toVersion) return; // Don't do anything if the version has not changed if (compareVersions(fromVersion, '1.0.30') < 0) { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on the 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true'); } settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } <|file_sep|>current/src/dataMigration.js import packageJson from '../package.json'; import compareVersions from 'semver-compare'; import { SETTINGS_KEYS } from './settings'; export function migrateDataToVersion(database, settings) { // Get the current version we are upgrading from let fromVersion = settings.get(SETTINGS_KEYS.APP_VERSION); // If no is version saved, it is from an early version, which can be represented as 0.0.0 if (!fromVersion || fromVersion.length === 0) fromVersion = '0.0.0'; // Get the new version we are upgrading to const toVersion = packageJson.version; // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); } // Record the new app version settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } <|file_sep|>updated/src/dataMigration.js const toVersion = packageJson.version; // If the version has not changed, we are not upgrading, so don't do anything if (fromVersion === toVersion) return; // Do any required version update data migrations for (const migration of dataMigrations) { if (compareVersions(fromVersion, migration.version) < 0) migration.migrate(database, settings); } // Record the new app version settings.set(SETTINGS_KEYS.APP_VERSION, toVersion); } // All data migration functions should be kept in this array, in sequential order. Each migration // needs a 'version' key, denoting the version that migration will migrate to, and a 'migrate' key, // which is a function taking the database and the settings and performs the migration const dataMigrations = [ { version: '1.0.30', migrate: (database, settings) => { // 1.0.30 added the setting 'SYNC_IS_INITIALISED', where it previously relied on 'SYNC_URL' const syncURL = settings.get(SETTINGS_KEYS.SYNC_URL); if (syncURL && syncURL.length > 0) settings.set(SETTINGS_KEYS.SYNC_IS_INITIALISED, 'true');
e18ede905a3b32c13ab08a5aae5139f91cbd57de
src/dataMigration.js
src/dataMigration.js
JavaScript
<|file_sep|>app/controllers/topics_controller.rb.diff original: before_filter :authenticate_user! updated: before_filter :authenticate_user!, :except => [ :show ] <|file_sep|>original/app/controllers/topics_controller.rb flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] authorize! :read, @topic end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end <|file_sep|>current/app/controllers/topics_controller.rb flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] authorize! :read, @topic end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end <|file_sep|>updated/app/controllers/topics_controller.rb
flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] redirect_to club_sales_page_path(@topic.club) unless user_signed_in? and can?(:read, @topic) end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end
<|file_sep|>app/controllers/topics_controller.rb.diff original: before_filter :authenticate_user! updated: before_filter :authenticate_user!, :except => [ :show ] <|file_sep|>original/app/controllers/topics_controller.rb flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] authorize! :read, @topic end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end <|file_sep|>current/app/controllers/topics_controller.rb flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] authorize! :read, @topic end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end <|file_sep|>updated/app/controllers/topics_controller.rb flash[:notice] = "Topic posted successfully" redirect_to edit_discussion_board_path(@discussion_board) else render :new end flash.discard end def show @topic = Topic.find params[:id] redirect_to club_sales_page_path(@topic.club) unless user_signed_in? and can?(:read, @topic) end private def get_discussion_board @discussion_board = DiscussionBoard.find params[:discussion_board_id] end end
be7e0b4edd73adea17d32661158d547b03210f84
app/controllers/topics_controller.rb
app/controllers/topics_controller.rb
Ruby
<|file_sep|>original/packages/reward-root-submitter/reward_root_submitter/config.py return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("WARNING") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values <|file_sep|>current/packages/reward-root-submitter/reward_root_submitter/config.py return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("WARNING") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values <|file_sep|>updated/packages/reward-root-submitter/reward_root_submitter/config.py
return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("INFO") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values
<|file_sep|>original/packages/reward-root-submitter/reward_root_submitter/config.py return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("WARNING") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values <|file_sep|>current/packages/reward-root-submitter/reward_root_submitter/config.py return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("WARNING") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values <|file_sep|>updated/packages/reward-root-submitter/reward_root_submitter/config.py return secret_value["SecretString"] class Config(BaseSettings): environment: str evm_full_node_url: str reward_root_submitter_address: str reward_root_submitter_private_key: str reward_root_submitter_sentry_dsn: str log_level: str = Field("INFO") @root_validator(pre=True) def load_secrets(cls, values): env = values["environment"] for field_name, field in cls.__fields__.items(): # Check it isn't already set *and* there is no default if field_name not in values and field.default is None: values[field_name] = get_secret(f"{env}_{field_name}") return values
30f32266a1f8ac698d9da5da79c88867e781084a
packages/reward-root-submitter/reward_root_submitter/config.py
packages/reward-root-submitter/reward_root_submitter/config.py
Python
<|file_sep|>original/latestVersion.sbt latestVersion in ThisBuild := "0.9.0" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.0") unreleasedModuleNames in ThisBuild := Set() <|file_sep|>current/latestVersion.sbt latestVersion in ThisBuild := "0.9.0" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.0") unreleasedModuleNames in ThisBuild := Set() <|file_sep|>updated/latestVersion.sbt
latestVersion in ThisBuild := "0.9.1" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.1") unreleasedModuleNames in ThisBuild := Set()
<|file_sep|>original/latestVersion.sbt latestVersion in ThisBuild := "0.9.0" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.0") unreleasedModuleNames in ThisBuild := Set() <|file_sep|>current/latestVersion.sbt latestVersion in ThisBuild := "0.9.0" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.0") unreleasedModuleNames in ThisBuild := Set() <|file_sep|>updated/latestVersion.sbt latestVersion in ThisBuild := "0.9.1" latestBinaryCompatibleVersion in ThisBuild := Some("0.9.1") unreleasedModuleNames in ThisBuild := Set()
c17056c62b07af1b2fc77456e5c264c90d2359c5
latestVersion.sbt
latestVersion.sbt
Scala
<|file_sep|>original/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java <|file_sep|>current/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java <|file_sep|>updated/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java
package org.jboss.shamrock.maven; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Map; import java.util.Properties; import java.util.TreeMap; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter;
<|file_sep|>original/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java <|file_sep|>current/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java <|file_sep|>updated/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java package org.jboss.shamrock.maven; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Map; import java.util.Properties; import java.util.TreeMap; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter;
5eb1a8b9a494f777b5f32045bccf20fa870bc8e9
maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java
maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java
Java
<|file_sep|>original/app/views/projects/commits/_head.html.haml %ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats <|file_sep|>current/app/views/projects/commits/_head.html.haml %ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats <|file_sep|>updated/app/views/projects/commits/_head.html.haml
%ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats
<|file_sep|>original/app/views/projects/commits/_head.html.haml %ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats <|file_sep|>current/app/views/projects/commits/_head.html.haml %ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats <|file_sep|>updated/app/views/projects/commits/_head.html.haml %ul.nav.nav-tabs %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do = link_to 'Commits', project_commits_path(@project, @repository.root_ref) = nav_link(controller: :compare) do = link_to 'Compare', project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref) = nav_link(html_options: {class: branches_tab_class}) do = link_to recent_project_branches_path(@project) do Branches %span.badge= @repository.branches.length = nav_link(controller: :tags) do = link_to project_tags_path(@project) do Tags %span.badge= @repository.tags.length = nav_link(controller: :repositories, action: :stats) do = link_to stats_project_repository_path(@project) do Stats
5f67a85e6080c9527c0ad0cbc62a5af84ecf1eb7
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
Haml
<|file_sep|>original/app/views/layouts/devise.html.haml !!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield <|file_sep|>current/app/views/layouts/devise.html.haml !!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield <|file_sep|>updated/app/views/layouts/devise.html.haml
!!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br Sign in or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield
<|file_sep|>original/app/views/layouts/devise.html.haml !!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield <|file_sep|>current/app/views/layouts/devise.html.haml !!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield <|file_sep|>updated/app/views/layouts/devise.html.haml !!! 5 %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page = render "layouts/flash" .container .content %center %h1 GitLab %p.light GitLab is open source software to collaborate on code. %br Sign in or browse for #{link_to "public projects", public_projects_path}. %hr .container .content = yield
7e22c90b799a9c3ba56312b1475637b9d040396e
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
Haml
<|file_sep|>original/bootstrap-wysiwyg.css height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow:scroll; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent; cursor: pointer; <|file_sep|>current/bootstrap-wysiwyg.css height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow:scroll; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent; cursor: pointer; <|file_sep|>updated/bootstrap-wysiwyg.css
height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow: scroll; outline: none; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent;
<|file_sep|>original/bootstrap-wysiwyg.css height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow:scroll; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent; cursor: pointer; <|file_sep|>current/bootstrap-wysiwyg.css height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow:scroll; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent; cursor: pointer; <|file_sep|>updated/bootstrap-wysiwyg.css height: 250px; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); padding: 4px; box-sizing: content-box; -webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; overflow: scroll; outline: none; } #voiceBtn { width: 20px; color: transparent; background-color: transparent; transform: scale(2.0, 2.0); -webkit-transform: scale(2.0, 2.0); -moz-transform: scale(2.0, 2.0); border: transparent;
01f31ed549c3cced612efcf794e529f79bc87215
bootstrap-wysiwyg.css
bootstrap-wysiwyg.css
CSS
<|file_sep|>app/partials/issue/assign-sprint-to-issue-button.jade.diff original: updated: ng-mouseenter="detach=true" ng-mouseleave="detach=false" <|file_sep|>original/app/partials/issue/assign-sprint-to-issue-button.jade tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ) tg-svg(svg-icon="icon-detach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list( label="{{ 'ISSUES.CHOOSE_SPRINT' | translate }}" placeholder="{{ 'ISSUES.FILTER_SPRINTS' | translate }}" items="milestones" ng-model="selectedSprint" filter-by="['name', 'estimated_start', 'estimated_finish']" <|file_sep|>current/app/partials/issue/assign-sprint-to-issue-button.jade tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ng-mouseenter="detach=true" ng-mouseleave="detach=false" ) tg-svg(svg-icon="icon-detach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list( label="{{ 'ISSUES.CHOOSE_SPRINT' | translate }}" placeholder="{{ 'ISSUES.FILTER_SPRINTS' | translate }}" items="milestones" <|file_sep|>updated/app/partials/issue/assign-sprint-to-issue-button.jade
tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ng-mouseenter="detach=true" ng-mouseleave="detach=false" ) tg-svg(ng-show="detach" svg-icon="icon-detach") tg-svg(ng-show="!detach" svg-icon="icon-attach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list(
<|file_sep|>app/partials/issue/assign-sprint-to-issue-button.jade.diff original: updated: ng-mouseenter="detach=true" ng-mouseleave="detach=false" <|file_sep|>original/app/partials/issue/assign-sprint-to-issue-button.jade tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ) tg-svg(svg-icon="icon-detach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list( label="{{ 'ISSUES.CHOOSE_SPRINT' | translate }}" placeholder="{{ 'ISSUES.FILTER_SPRINTS' | translate }}" items="milestones" ng-model="selectedSprint" filter-by="['name', 'estimated_start', 'estimated_finish']" <|file_sep|>current/app/partials/issue/assign-sprint-to-issue-button.jade tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ng-mouseenter="detach=true" ng-mouseleave="detach=false" ) tg-svg(svg-icon="icon-detach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list( label="{{ 'ISSUES.CHOOSE_SPRINT' | translate }}" placeholder="{{ 'ISSUES.FILTER_SPRINTS' | translate }}" items="milestones" <|file_sep|>updated/app/partials/issue/assign-sprint-to-issue-button.jade tg-svg(svg-icon="icon-attach") a.assign-issue-button.button-green.is-editable.button-set( href="" ng-show="issue.milestone" tg-check-permission="modify_issue" title="{{ 'ISSUES.ACTION_DETACH_SPRINT' | translate }}" ng-mouseenter="detach=true" ng-mouseleave="detach=false" ) tg-svg(ng-show="detach" svg-icon="icon-detach") tg-svg(ng-show="!detach" svg-icon="icon-attach") .lightbox.lightbox-assign-sprint-to-issue tg-lightbox-close div.lightbox-assign-related-sprint h2.title {{ 'ISSUES.ACTION_ATTACH_SPRINT' | translate }} tg-search-list(
fcef1b4125fc63cdbcf760373869bd6e589abccf
app/partials/issue/assign-sprint-to-issue-button.jade
app/partials/issue/assign-sprint-to-issue-button.jade
Jade
<|file_sep|>changes/constants.py.diff original: errored = 4 updated: <|file_sep|>original/changes/constants.py Status.unknown: 'Unknown', Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.errored: 'Errored', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', <|file_sep|>current/changes/constants.py Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.errored: 'Errored', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', } <|file_sep|>updated/changes/constants.py
Status.unknown: 'Unknown', Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', }
<|file_sep|>changes/constants.py.diff original: errored = 4 updated: <|file_sep|>original/changes/constants.py Status.unknown: 'Unknown', Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.errored: 'Errored', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', <|file_sep|>current/changes/constants.py Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.errored: 'Errored', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', } <|file_sep|>updated/changes/constants.py Status.unknown: 'Unknown', Status.queued: 'Queued', Status.in_progress: 'In progress', Status.finished: 'Finished' } RESULT_LABELS = { Result.unknown: 'Unknown', Result.passed: 'Passed', Result.failed: 'Failed', Result.skipped: 'Skipped', Result.aborted: 'Aborted', Result.timedout: 'Timed out' } CAUSE_LABELS = { Cause.unknown: 'Unknown', Cause.manual: 'Manual', Cause.push: 'Code Push', Cause.retry: 'Retry', }
b973c6abe4d325b08278822f85f72ebc1761a825
changes/constants.py
changes/constants.py
Python
<|file_sep|>original/packages/ic/ical.yaml <|file_sep|>current/packages/ic/ical.yaml <|file_sep|>updated/packages/ic/ical.yaml
homepage: http://github.com/chrisdone/ical#readme changelog-type: '' hash: ffe16b2ee1cf9edbd134aab8d7d54425d3e672d31e25540f4685e10aec8bdc42 test-bench-deps: ical: -any base: -any maintainer: chrisdone@gmail.com synopsis: iCalendar format parser and org-mode converter. changelog: '' basic-deps: either: ! '>=4.4.1' ical: -any base: ! '>=4.7 && <5' time: ! '>=1.5.0.1' text: ! '>=1.2.1.3' containers: ! '>=0.5.6.2' mtl: ! '>=2.2.1' attoparsec: ! '>=0.12.1.6' transformers: ! '>=0.4.2.0' aeson: ! '>=0.8.0.2' all-versions:
<|file_sep|>original/packages/ic/ical.yaml <|file_sep|>current/packages/ic/ical.yaml <|file_sep|>updated/packages/ic/ical.yaml homepage: http://github.com/chrisdone/ical#readme changelog-type: '' hash: ffe16b2ee1cf9edbd134aab8d7d54425d3e672d31e25540f4685e10aec8bdc42 test-bench-deps: ical: -any base: -any maintainer: chrisdone@gmail.com synopsis: iCalendar format parser and org-mode converter. changelog: '' basic-deps: either: ! '>=4.4.1' ical: -any base: ! '>=4.7 && <5' time: ! '>=1.5.0.1' text: ! '>=1.2.1.3' containers: ! '>=0.5.6.2' mtl: ! '>=2.2.1' attoparsec: ! '>=0.12.1.6' transformers: ! '>=0.4.2.0' aeson: ! '>=0.8.0.2' all-versions:
ca75fb3d4d6038d9e83270e2358816be0cf74a9c
packages/ic/ical.yaml
packages/ic/ical.yaml
YAML
<|file_sep|>original/raygun_client.gemspec # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.6' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls' <|file_sep|>current/raygun_client.gemspec # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.6' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls' <|file_sep|>updated/raygun_client.gemspec
# -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.7' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls'
<|file_sep|>original/raygun_client.gemspec # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.6' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls' <|file_sep|>current/raygun_client.gemspec # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.6' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls' <|file_sep|>updated/raygun_client.gemspec # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'raygun_client' s.version = '0.1.7' s.summary = 'Client for the Raygun API using the Obsidian HTTP client' s.description = ' ' s.authors = ['Obsidian Software, Inc'] s.email = 'opensource@obsidianexchange.com' s.homepage = 'https://github.com/obsidian-btc/raygun-client' s.licenses = ['MIT'] s.require_paths = ['lib'] s.files = Dir.glob('{lib}/**/*') s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.2.3' s.add_runtime_dependency 'error_data' s.add_runtime_dependency 'serialize' s.add_runtime_dependency 'connection' s.add_runtime_dependency 'controls'
8e8d888048818768a12726f923009e3a0513a36c
raygun_client.gemspec
raygun_client.gemspec
Ruby
<|file_sep|>original/requirements/base.txt bleach==3.1.4 Django==2.2.11 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8 <|file_sep|>current/requirements/base.txt bleach==3.1.4 Django==2.2.11 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8 <|file_sep|>updated/requirements/base.txt
bleach==3.1.4 Django==2.2.12 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8
<|file_sep|>original/requirements/base.txt bleach==3.1.4 Django==2.2.11 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8 <|file_sep|>current/requirements/base.txt bleach==3.1.4 Django==2.2.11 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8 <|file_sep|>updated/requirements/base.txt bleach==3.1.4 Django==2.2.12 # pyup: <2.3 django-allauth==0.41.0 django-autoslug==1.9.6 django-background-tasks==1.2.0 django-ckeditor==5.9.0 django-filter==2.2.0 django-multiselectfield==0.1.12 django-widget-tweaks==1.4.8 djangorestframework==3.11.0 easy-thumbnails==2.7 html5lib==1.0.1 jsonfield==3.1.0 psycopg2-binary==2.8.4 python-dateutil==2.8.1 python-magic==0.4.15 rules==2.2 XlsxWriter==1.2.8
039968b7e4a4e83827d45f9cc614f6e0610b208c
requirements/base.txt
requirements/base.txt
Text
<|file_sep|>invoice_condition_template/account_invoice_view.xml.diff original: <data> <record model="ir.ui.view" id="invoice_form_add_condition"> <field name="name">account.invoice.form.condition</field> <field name="model">account.invoice</field> <field name="inherit_id" ref="account.invoice_form"/> <field name="arch" type="xml"> updated: <data> <record model="ir.ui.view" id="invoice_form_add_condition"> <field name="name">account.invoice.form.condition</field> <field name="model">account.invoice</field> <field name="inherit_id" ref="account.invoice_form"/> <field name="arch" type="xml"> <|file_sep|>invoice_condition_template/account_invoice_view.xml.diff original: <xpath expr="//field[@name='invoice_line']" position="before"> <label for="note1"/> <field name="note1" colspan="4"/> <group> <div>Use template <field name="condition_template1_id" nolabel="1" class='oe_inline' domain="[('position','=','before_lines')]"/> </div> </group> </xpath> updated: <xpath expr="/form/sheet/notebook/page[3]" position="after"> <page string="Comments" name="comments"> <label string="The comments will be displayed on the printed document. You can load a predefined template, write your own text or load a template and then modify it only for this document." colspan="2"/> <group string="Top Comments"> <field name="condition_template1_id" string="Load a template" domain="[('position','=','before_lines')]" context="{'default_position': 'before_lines'}"/> <field name="note1" nolabel="1" colspan="2"/> </group> <group string="Bottom Comments"> <field name="condition_template2_id" string="Load a template" context="{'default_position': 'after_lines'}" domain="[('position','=','after_lines')]"/> <field name="note2" nolabel="1" colspan="2"/> </group> </page> </xpath> <|file_sep|>original/invoice_condition_template/account_invoice_view.xml </group> </xpath> <xpath expr="//field[@name='comment']" position="replace"> <field name="comment" colspan="4"/> <label for="note2"/> <field name="note2" colspan="4"/> <group> <div>Use template <field name="condition_template2_id" nolabel="1" class='oe_inline' domain="[('position','=','after_lines')]"/> </div> </group> </xpath> </field> </record> </data> </openerp> <|file_sep|>current/invoice_condition_template/account_invoice_view.xml </page> </xpath> <xpath expr="//field[@name='comment']" position="replace"> <field name="comment" colspan="4"/> <label for="note2"/> <field name="note2" colspan="4"/> <group> <div>Use template <field name="condition_template2_id" nolabel="1" class='oe_inline' domain="[('position','=','after_lines')]"/> </div> </group> </xpath> </field> </record> </data> </openerp> <|file_sep|>updated/invoice_condition_template/account_invoice_view.xml
<group string="Top Comments"> <field name="condition_template1_id" string="Load a template" domain="[('position','=','before_lines')]" context="{'default_position': 'before_lines'}"/> <field name="note1" nolabel="1" colspan="2"/> </group> <group string="Bottom Comments"> <field name="condition_template2_id" string="Load a template" context="{'default_position': 'after_lines'}" domain="[('position','=','after_lines')]"/> <field name="note2" nolabel="1" colspan="2"/> </group> </page> </xpath> </field> </record> </data> </openerp>
<|file_sep|>invoice_condition_template/account_invoice_view.xml.diff original: <data> <record model="ir.ui.view" id="invoice_form_add_condition"> <field name="name">account.invoice.form.condition</field> <field name="model">account.invoice</field> <field name="inherit_id" ref="account.invoice_form"/> <field name="arch" type="xml"> updated: <data> <record model="ir.ui.view" id="invoice_form_add_condition"> <field name="name">account.invoice.form.condition</field> <field name="model">account.invoice</field> <field name="inherit_id" ref="account.invoice_form"/> <field name="arch" type="xml"> <|file_sep|>invoice_condition_template/account_invoice_view.xml.diff original: <xpath expr="//field[@name='invoice_line']" position="before"> <label for="note1"/> <field name="note1" colspan="4"/> <group> <div>Use template <field name="condition_template1_id" nolabel="1" class='oe_inline' domain="[('position','=','before_lines')]"/> </div> </group> </xpath> updated: <xpath expr="/form/sheet/notebook/page[3]" position="after"> <page string="Comments" name="comments"> <label string="The comments will be displayed on the printed document. You can load a predefined template, write your own text or load a template and then modify it only for this document." colspan="2"/> <group string="Top Comments"> <field name="condition_template1_id" string="Load a template" domain="[('position','=','before_lines')]" context="{'default_position': 'before_lines'}"/> <field name="note1" nolabel="1" colspan="2"/> </group> <group string="Bottom Comments"> <field name="condition_template2_id" string="Load a template" context="{'default_position': 'after_lines'}" domain="[('position','=','after_lines')]"/> <field name="note2" nolabel="1" colspan="2"/> </group> </page> </xpath> <|file_sep|>original/invoice_condition_template/account_invoice_view.xml </group> </xpath> <xpath expr="//field[@name='comment']" position="replace"> <field name="comment" colspan="4"/> <label for="note2"/> <field name="note2" colspan="4"/> <group> <div>Use template <field name="condition_template2_id" nolabel="1" class='oe_inline' domain="[('position','=','after_lines')]"/> </div> </group> </xpath> </field> </record> </data> </openerp> <|file_sep|>current/invoice_condition_template/account_invoice_view.xml </page> </xpath> <xpath expr="//field[@name='comment']" position="replace"> <field name="comment" colspan="4"/> <label for="note2"/> <field name="note2" colspan="4"/> <group> <div>Use template <field name="condition_template2_id" nolabel="1" class='oe_inline' domain="[('position','=','after_lines')]"/> </div> </group> </xpath> </field> </record> </data> </openerp> <|file_sep|>updated/invoice_condition_template/account_invoice_view.xml <group string="Top Comments"> <field name="condition_template1_id" string="Load a template" domain="[('position','=','before_lines')]" context="{'default_position': 'before_lines'}"/> <field name="note1" nolabel="1" colspan="2"/> </group> <group string="Bottom Comments"> <field name="condition_template2_id" string="Load a template" context="{'default_position': 'after_lines'}" domain="[('position','=','after_lines')]"/> <field name="note2" nolabel="1" colspan="2"/> </group> </page> </xpath> </field> </record> </data> </openerp>
348de40de0bf24fb2749555e47e3af5be327c2e1
invoice_condition_template/account_invoice_view.xml
invoice_condition_template/account_invoice_view.xml
XML
<|file_sep|>original/spec/praxis/extensions/rendering_spec.rb <|file_sep|>current/spec/praxis/extensions/rendering_spec.rb <|file_sep|>updated/spec/praxis/extensions/rendering_spec.rb
require 'spec_helper' describe Praxis::Extensions::Rendering do let(:test_class) do Struct.new(:media_type, :expanded_fields, :response) do |klass| include Praxis::Extensions::Rendering end end let(:media_type) { Person } let(:expanded_fields) { {id: true, name: true} } let(:response) { double('response', headers: {}) } let(:object) { {id: 1, name: 'bob', href: '/people/bob'} } subject(:instance) { test_class.new(media_type, expanded_fields, response) } context '#render' do subject(:output) { instance.render(object) } it 'loads and renders the object' do expect(output).to eq(id: 1, name: 'bob')
<|file_sep|>original/spec/praxis/extensions/rendering_spec.rb <|file_sep|>current/spec/praxis/extensions/rendering_spec.rb <|file_sep|>updated/spec/praxis/extensions/rendering_spec.rb require 'spec_helper' describe Praxis::Extensions::Rendering do let(:test_class) do Struct.new(:media_type, :expanded_fields, :response) do |klass| include Praxis::Extensions::Rendering end end let(:media_type) { Person } let(:expanded_fields) { {id: true, name: true} } let(:response) { double('response', headers: {}) } let(:object) { {id: 1, name: 'bob', href: '/people/bob'} } subject(:instance) { test_class.new(media_type, expanded_fields, response) } context '#render' do subject(:output) { instance.render(object) } it 'loads and renders the object' do expect(output).to eq(id: 1, name: 'bob')
401bbb80b41e71c537cce33dce282471c57b0bda
spec/praxis/extensions/rendering_spec.rb
spec/praxis/extensions/rendering_spec.rb
Ruby
<|file_sep|>original/requirements_dev.txt pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.2 <|file_sep|>current/requirements_dev.txt pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.2 <|file_sep|>updated/requirements_dev.txt
pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.3
<|file_sep|>original/requirements_dev.txt pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.2 <|file_sep|>current/requirements_dev.txt pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.2 <|file_sep|>updated/requirements_dev.txt pip==9.0.1 bumpversion==0.5.3 wheel==0.30.0 watchdog==0.8.3 flake8==3.4.1 cryptography==2.0.3 tox==2.9.1 coverage==4.4.1 Sphinx==1.6.4 pyup-update-pytest-3.2.2 PyYAML==3.12 pytest-runner==2.12.1 pytest==3.2.3
0722c15c2cb6e0e2b3a1574f10b67a4863f1e11f
requirements_dev.txt
requirements_dev.txt
Text
<|file_sep|>original/.travis.yml language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-28 - build-tools-28.0.3 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" <|file_sep|>current/.travis.yml language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-28 - build-tools-28.0.3 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" <|file_sep|>updated/.travis.yml
language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-30 - build-tools-30.0.2 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
<|file_sep|>original/.travis.yml language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-28 - build-tools-28.0.3 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" <|file_sep|>current/.travis.yml language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-28 - build-tools-28.0.3 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" <|file_sep|>updated/.travis.yml language: android jdk: - oraclejdk8 android: components: - tools - platform-tools - android-30 - build-tools-30.0.2 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" - "$HOME/.android/build-cache" before_install: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
d0791c80bb03c58bc97fe9f85760d5011cd70660
.travis.yml
.travis.yml
YAML
<|file_sep|>original/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade // Breadcrumbs menu for debug ol.breadcrumb li a(ui-sref="upgrade") Upgrade li a(ui-sref="upgrade.prepare") Prepare Nodes li a(ui-sref="upgrade.backup") Backup li.active Reinstall Admin Server button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes... <|file_sep|>current/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade // Breadcrumbs menu for debug ol.breadcrumb li a(ui-sref="upgrade") Upgrade li a(ui-sref="upgrade.prepare") Prepare Nodes li a(ui-sref="upgrade.backup") Backup li.active Reinstall Admin Server button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes... <|file_sep|>updated/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade
button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes...
<|file_sep|>original/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade // Breadcrumbs menu for debug ol.breadcrumb li a(ui-sref="upgrade") Upgrade li a(ui-sref="upgrade.prepare") Prepare Nodes li a(ui-sref="upgrade.backup") Backup li.active Reinstall Admin Server button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes... <|file_sep|>current/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade // Breadcrumbs menu for debug ol.breadcrumb li a(ui-sref="upgrade") Upgrade li a(ui-sref="upgrade.prepare") Prepare Nodes li a(ui-sref="upgrade.backup") Backup li.active Reinstall Admin Server button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes... <|file_sep|>updated/assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade button.btn.btn-primary.pull-right(type='button', ng-click="steps.nextStep()", ng-if="!steps.isLastStep()") span.fa-fw.fa.fa-chevron-right(aria-hidden="true") | Continue Upgrade Process button.btn.btn-primary.disabled.pull-right(type='button', ng-click="steps.nextStep()", ng-if="steps.isLastStep()") span.fa-fw.fa-spinner.fa.fa-spin(aria-hidden="true") | Upgrading Nodes...
354826de680a7279c9f3e314932bc361983a38f0
assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade
assets/app/widgets/crowbar-upgrade-nav/crowbar-upgrade-nav.directive.jade
Jade
<|file_sep|>original/HelloWorld/src/HelloWorld.java import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); Button.ESCAPE.waitForPressAndRelease(); } } <|file_sep|>current/HelloWorld/src/HelloWorld.java import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); Button.ESCAPE.waitForPressAndRelease(); } } <|file_sep|>updated/HelloWorld/src/HelloWorld.java
import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); LCD.drawString("Second line", 1, 2); Button.ESCAPE.waitForPressAndRelease(); } }
<|file_sep|>original/HelloWorld/src/HelloWorld.java import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); Button.ESCAPE.waitForPressAndRelease(); } } <|file_sep|>current/HelloWorld/src/HelloWorld.java import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); Button.ESCAPE.waitForPressAndRelease(); } } <|file_sep|>updated/HelloWorld/src/HelloWorld.java import lejos.nxt.Button; import lejos.nxt.LCD; public class HelloWorld { public static void main(String args[]) throws InterruptedException{ LCD.drawString("Hello World!", 1, 1); LCD.drawString("Second line", 1, 2); Button.ESCAPE.waitForPressAndRelease(); } }
0e280058561a9dcce9caeb27636c9a921a79d2b2
HelloWorld/src/HelloWorld.java
HelloWorld/src/HelloWorld.java
Java
<|file_sep|>.travis.yml.diff original: - "3.6" updated: <|file_sep|>original/.travis.yml language: python python: - "3.6" - "3.7" - "3.8" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done <|file_sep|>current/.travis.yml language: python python: - "3.7" - "3.8" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done <|file_sep|>updated/.travis.yml
language: python python: - "3.7" - "3.8" - "3.9" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done
<|file_sep|>.travis.yml.diff original: - "3.6" updated: <|file_sep|>original/.travis.yml language: python python: - "3.6" - "3.7" - "3.8" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done <|file_sep|>current/.travis.yml language: python python: - "3.7" - "3.8" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done <|file_sep|>updated/.travis.yml language: python python: - "3.7" - "3.8" - "3.9" install: - pip install --upgrade pip - pip install more-itertools numpy jaxlib optax --upgrade - pip install git+https://github.com/google/jax.git - pip install -e . script: - set -e - for f in tests/*.py; do python $f; done
1f6fef6a5d76009f2893b1ce8ecef83c72b5404a
.travis.yml
.travis.yml
YAML
<|file_sep|>original/HyREPL/session.hy [--init-- (fn [self] (setv self.uuid (str (uuid4))) (assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (.sendall transport (bencode.encode msg)))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]]) <|file_sep|>current/HyREPL/session.hy [--init-- (fn [self] (setv self.uuid (str (uuid4))) (assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (.sendall transport (bencode.encode msg)))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]]) <|file_sep|>updated/HyREPL/session.hy
(assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (try (.sendall transport (bencode.encode msg)) (except [e OSError] (print (.format "Client gone: {}" e) :file sys.stderr))))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]])
<|file_sep|>original/HyREPL/session.hy [--init-- (fn [self] (setv self.uuid (str (uuid4))) (assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (.sendall transport (bencode.encode msg)))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]]) <|file_sep|>current/HyREPL/session.hy [--init-- (fn [self] (setv self.uuid (str (uuid4))) (assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (.sendall transport (bencode.encode msg)))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]]) <|file_sep|>updated/HyREPL/session.hy (assoc sessions self.uuid self) None)] [--str-- (fn [self] self.uuid)] [--repr-- (fn [self] self.uuid)] [write (fn [self msg transport] (assert (in "id" msg)) (assoc msg "session" self.uuid) (print "out:" msg :file sys.stderr) (try (.sendall transport (bencode.encode msg)) (except [e OSError] (print (.format "Client gone: {}" e) :file sys.stderr))))] [handle (fn [self msg transport] (print "in:" msg :file sys.stderr) ((find-op (.get msg "op")) self msg transport))]])
e789683ed0d847a488407e5ad6815c8a71e88d76
HyREPL/session.hy
HyREPL/session.hy
Hy
<|file_sep|>original/data/panel/events.js event.preventDefault(); handler.call(element, event); }; element.addEventListener("submit", wrapper); } exports.setSubmitHandler = setSubmitHandler; function setResetHandler(element, handler) { if (typeof element == "string") element = $(element); let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; <|file_sep|>current/data/panel/events.js event.preventDefault(); handler.call(element, event); }; element.addEventListener("submit", wrapper); } exports.setSubmitHandler = setSubmitHandler; function setResetHandler(element, handler) { if (typeof element == "string") element = $(element); let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; <|file_sep|>updated/data/panel/events.js
let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; document.addEventListener("keydown", event => { // This currently doesn't work in Firefox: https://bugzil.la/1443758 if (event.key == "Escape") { let activePanel = require("./utils").getActivePanel(); if (activePanel) { let button = $(activePanel).querySelector("button[type='reset']"); if (button)
<|file_sep|>original/data/panel/events.js event.preventDefault(); handler.call(element, event); }; element.addEventListener("submit", wrapper); } exports.setSubmitHandler = setSubmitHandler; function setResetHandler(element, handler) { if (typeof element == "string") element = $(element); let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; <|file_sep|>current/data/panel/events.js event.preventDefault(); handler.call(element, event); }; element.addEventListener("submit", wrapper); } exports.setSubmitHandler = setSubmitHandler; function setResetHandler(element, handler) { if (typeof element == "string") element = $(element); let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; <|file_sep|>updated/data/panel/events.js let wrapper = (event) => { if (exports.disableResetHandlers) return; handler.call(element, event); }; element.addEventListener("reset", wrapper); } exports.setResetHandler = setResetHandler; document.addEventListener("keydown", event => { // This currently doesn't work in Firefox: https://bugzil.la/1443758 if (event.key == "Escape") { let activePanel = require("./utils").getActivePanel(); if (activePanel) { let button = $(activePanel).querySelector("button[type='reset']"); if (button)
10d12e7c1177efc6ba688b7b38aa6f6c3112e8de
data/panel/events.js
data/panel/events.js
JavaScript
<|file_sep|>original/composer.json { "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/framework": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" } <|file_sep|>current/composer.json { "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/framework": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" } <|file_sep|>updated/composer.json
{ "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/cms": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" }
<|file_sep|>original/composer.json { "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/framework": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" } <|file_sep|>current/composer.json { "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/framework": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" } <|file_sep|>updated/composer.json { "name": "weboftalent/mappable-poi", "description": "Adds point of interest functionality to the mappable module.", "type": "silverstripe-module", "keywords": ["silverstripe", "google maps", "maps", "mappable", "points of interest"], "authors": [{ "name": "Gordon Anderson", "email": "gordon.b.anderson@gmail.com", "homepage": "https://github.com/gordonbanderson/MappablePointsOfInterest", "role": "Developer" }], "require": { "silverstripe/cms": "~3.1", "weboftalent/mappable": "~3.1" }, "support": { "issues": "https://github.com/gordonbanderson/MappablePointsOfInterest/issues" }, "license": "MIT" }
b6bc571b41e62d54160cfd02e2769b1c70befc07
composer.json
composer.json
JSON
<|file_sep|>original/index.js sidebar.show(); } var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (results) { worker.port.emit('queryResults', results, queryId); }); }); } }); <|file_sep|>current/index.js sidebar.show(); } var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (results) { worker.port.emit('queryResults', results, queryId); }); }); } }); <|file_sep|>updated/index.js
} var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (bookmarks) { const fixedBookmarks = bookmarks.map(bookmark => {bookmark.tags = [...bookmark.tags]; return bookmark;}); worker.port.emit('queryResults', fixedBookmarks, queryId); }); }); } });
<|file_sep|>original/index.js sidebar.show(); } var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (results) { worker.port.emit('queryResults', results, queryId); }); }); } }); <|file_sep|>current/index.js sidebar.show(); } var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (results) { worker.port.emit('queryResults', results, queryId); }); }); } }); <|file_sep|>updated/index.js } var sidebar = require('sdk/ui/sidebar').Sidebar({ id: 'elasticmarks-sidebar', title: 'Elastic Bookmarks Sidebar', url: './sidebar.html', onAttach: function (worker) { worker.port.on('bmquery', function(query, queryId) { let { search } = require('sdk/places/bookmarks'); search( { query: query } ).on('end', function (bookmarks) { const fixedBookmarks = bookmarks.map(bookmark => {bookmark.tags = [...bookmark.tags]; return bookmark;}); worker.port.emit('queryResults', fixedBookmarks, queryId); }); }); } });
8bb53eb34850bc0ff0cc7aab1a3bacd39b0a6acc
index.js
index.js
JavaScript
<|file_sep|>packages/soya-next-scripts/src/utils/createEslintConfig.js.diff original: extends: 'marlint', updated: <|file_sep|>packages/soya-next-scripts/src/utils/createEslintConfig.js.diff original: ...eslintConfig, updated: extends: 'marlint', <|file_sep|>original/packages/soya-next-scripts/src/utils/createEslintConfig.js export default ({ rules, ...eslintConfig } = { extends: 'marlint', rules: {}, }) => ({ ...eslintConfig, rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, }); <|file_sep|>current/packages/soya-next-scripts/src/utils/createEslintConfig.js export default ({ rules, ...eslintConfig } = { rules: {}, }) => ({ extends: 'marlint', rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, }); <|file_sep|>updated/packages/soya-next-scripts/src/utils/createEslintConfig.js
export default ({ rules, ...eslintConfig } = { rules: {}, }) => ({ extends: 'marlint', rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, ...eslintConfig, });
<|file_sep|>packages/soya-next-scripts/src/utils/createEslintConfig.js.diff original: extends: 'marlint', updated: <|file_sep|>packages/soya-next-scripts/src/utils/createEslintConfig.js.diff original: ...eslintConfig, updated: extends: 'marlint', <|file_sep|>original/packages/soya-next-scripts/src/utils/createEslintConfig.js export default ({ rules, ...eslintConfig } = { extends: 'marlint', rules: {}, }) => ({ ...eslintConfig, rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, }); <|file_sep|>current/packages/soya-next-scripts/src/utils/createEslintConfig.js export default ({ rules, ...eslintConfig } = { rules: {}, }) => ({ extends: 'marlint', rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, }); <|file_sep|>updated/packages/soya-next-scripts/src/utils/createEslintConfig.js export default ({ rules, ...eslintConfig } = { rules: {}, }) => ({ extends: 'marlint', rules: { 'react/react-in-jsx-scope': 'off', ...rules, }, ...eslintConfig, });
0a6b843c0e0d4d22c0c218647aa15fd7d41d68ea
packages/soya-next-scripts/src/utils/createEslintConfig.js
packages/soya-next-scripts/src/utils/createEslintConfig.js
JavaScript
<|file_sep|>original/test/test_searchentities.py <|file_sep|>current/test/test_searchentities.py <|file_sep|>updated/test/test_searchentities.py
import unittest from . import models from sir.schema.searchentities import SearchEntity as E, SearchField as F class QueryResultToDictTest(unittest.TestCase): def setUp(self): self.entity = E(models.B, [ F("id", "id"), F("c_bar", "c.bar"), F("c_bar_trans", "c.bar", transformfunc=lambda v: v.union(set(["yay"]))) ], 1.1 ) self.expected = { "id": 1, "c_bar": "foo", "c_bar_trans": set(["foo", "yay"]), }
<|file_sep|>original/test/test_searchentities.py <|file_sep|>current/test/test_searchentities.py <|file_sep|>updated/test/test_searchentities.py import unittest from . import models from sir.schema.searchentities import SearchEntity as E, SearchField as F class QueryResultToDictTest(unittest.TestCase): def setUp(self): self.entity = E(models.B, [ F("id", "id"), F("c_bar", "c.bar"), F("c_bar_trans", "c.bar", transformfunc=lambda v: v.union(set(["yay"]))) ], 1.1 ) self.expected = { "id": 1, "c_bar": "foo", "c_bar_trans": set(["foo", "yay"]), }
d425fa64ece6826d299ca2daadb9a08afa6e87b5
test/test_searchentities.py
test/test_searchentities.py
Python
<|file_sep|>original/Readme.md ### Iteration 4 - Computer plays perfectly * Computer player cannot lose Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Author ------ [Josh Cheek](http://joshcheek.com/) <|file_sep|>current/Readme.md ### Iteration 4 - Computer plays perfectly * Computer player cannot lose Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Author ------ [Josh Cheek](http://joshcheek.com/) <|file_sep|>updated/Readme.md
Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Possible Future Features ------------------------ * Strict mode, which raises errors for common types of invalid behaviour Author ------ [Josh Cheek](http://joshcheek.com/)
<|file_sep|>original/Readme.md ### Iteration 4 - Computer plays perfectly * Computer player cannot lose Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Author ------ [Josh Cheek](http://joshcheek.com/) <|file_sep|>current/Readme.md ### Iteration 4 - Computer plays perfectly * Computer player cannot lose Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Author ------ [Josh Cheek](http://joshcheek.com/) <|file_sep|>updated/Readme.md Iterations For the Interface ---------------------------- I will think about this more later. Probably a simple CLI at first, then maybe a CLI with colour. Then perhaps a web interface or a gui. Possible Future Features ------------------------ * Strict mode, which raises errors for common types of invalid behaviour Author ------ [Josh Cheek](http://joshcheek.com/)
9335921149997ac6f95e74efb2b6076e0a04f2db
Readme.md
Readme.md
Markdown
<|file_sep|>main.py.diff original: logging.basicConfig(level=logging.DEBUG, updated: logging.basicConfig(level=logging.INFO, <|file_sep|>main.py.diff original: while True: try: tgBot.polling() except Exception as e: logging.error(e.message) updated: <|file_sep|>original/main.py import telebot import timer import bot import os logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") while True: try: tgBot.polling() except Exception as e: logging.error(e.message) <|file_sep|>current/main.py import telebot import timer import bot import os logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") # # import api # # print api.TrackerApi.getPackageInformation(3325607157191, "shentong") <|file_sep|>updated/main.py
import logging import telebot import timer import bot import os logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") tgBot.polling(none_stop=True)
<|file_sep|>main.py.diff original: logging.basicConfig(level=logging.DEBUG, updated: logging.basicConfig(level=logging.INFO, <|file_sep|>main.py.diff original: while True: try: tgBot.polling() except Exception as e: logging.error(e.message) updated: <|file_sep|>original/main.py import telebot import timer import bot import os logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") while True: try: tgBot.polling() except Exception as e: logging.error(e.message) <|file_sep|>current/main.py import telebot import timer import bot import os logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") # # import api # # print api.TrackerApi.getPackageInformation(3325607157191, "shentong") <|file_sep|>updated/main.py import logging import telebot import timer import bot import os logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logging.info("Begin start server.") tgBot = telebot.TeleBot(os.getenv("BOT_ID", "")) bot.getTracker(tgBot, logging)() timer.getTimer(tgBot, logging)("Timer").start() logging.info("Start polling") tgBot.polling(none_stop=True)
5f64b609b621626e04516cac1c3313a3f948f19e
main.py
main.py
Python
<|file_sep|>lib/marky_markov/persistent_dictionary.rb.diff original: @dictionarylocation = dictionary updated: @dictionarylocation = "#{dictionary}.mmd" <|file_sep|>original/lib/marky_markov/persistent_dictionary.rb @dictionarylocation = dictionary self.open_dictionary end def open_dictionary if File.exists?(@dictionarylocation) File.open(@dictionarylocation,'r') do |f| @dictionary = Yajl::Parser.parse(f) end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end end <|file_sep|>current/lib/marky_markov/persistent_dictionary.rb @dictionarylocation = "#{dictionary}.mmd" self.open_dictionary end def open_dictionary if File.exists?(@dictionarylocation) File.open(@dictionarylocation,'r') do |f| @dictionary = Yajl::Parser.parse(f) end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end end <|file_sep|>updated/lib/marky_markov/persistent_dictionary.rb
end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end def self.delete_dictionary!(dictionary) mmd = "#{dictionary}.mmd" if File.exists?(mmd) File.delete(mmd) "Deleted #{mmd}" end end end
<|file_sep|>lib/marky_markov/persistent_dictionary.rb.diff original: @dictionarylocation = dictionary updated: @dictionarylocation = "#{dictionary}.mmd" <|file_sep|>original/lib/marky_markov/persistent_dictionary.rb @dictionarylocation = dictionary self.open_dictionary end def open_dictionary if File.exists?(@dictionarylocation) File.open(@dictionarylocation,'r') do |f| @dictionary = Yajl::Parser.parse(f) end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end end <|file_sep|>current/lib/marky_markov/persistent_dictionary.rb @dictionarylocation = "#{dictionary}.mmd" self.open_dictionary end def open_dictionary if File.exists?(@dictionarylocation) File.open(@dictionarylocation,'r') do |f| @dictionary = Yajl::Parser.parse(f) end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end end <|file_sep|>updated/lib/marky_markov/persistent_dictionary.rb end else @dictionary = {} end end def save_dictionary! json = Yajl::Encoder.encode(@dictionary) File.open(@dictionarylocation, 'w') do |f| f.puts json end end def self.delete_dictionary!(dictionary) mmd = "#{dictionary}.mmd" if File.exists?(mmd) File.delete(mmd) "Deleted #{mmd}" end end end
92ae84da99f450d4c777196191e53dbe7590d77f
lib/marky_markov/persistent_dictionary.rb
lib/marky_markov/persistent_dictionary.rb
Ruby
<|file_sep|>original/src/numbbo_c_runtime.c /* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling goes through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); } <|file_sep|>current/src/numbbo_c_runtime.c /* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling goes through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); } <|file_sep|>updated/src/numbbo_c_runtime.c
/* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling go through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); }
<|file_sep|>original/src/numbbo_c_runtime.c /* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling goes through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); } <|file_sep|>current/src/numbbo_c_runtime.c /* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling goes through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); } <|file_sep|>updated/src/numbbo_c_runtime.c /* * Generic NUMBBO runtime implementation. * * Other language interfaces might want to replace this so that memory * allocation and error handling go through the respective language * runtime. */ #include <stdio.h> #include <stdlib.h> #include "numbbo.h" void numbbo_error(const char *message) { fprintf(stderr, "FATAL ERROR: %s\n", message); exit(EXIT_FAILURE); } void numbbo_warning(const char *message) { fprintf(stderr, "WARNING: %s\n", message); }
9766b5a197f355679321312e89819e41fa9bed81
src/numbbo_c_runtime.c
src/numbbo_c_runtime.c
C
<|file_sep|>original/024_swap_nodes_in_pairs.rb <|file_sep|>current/024_swap_nodes_in_pairs.rb <|file_sep|>updated/024_swap_nodes_in_pairs.rb
# Definition for singly-linked list. # class ListNode # attr_accessor :val, :next # def initialize(val) # @val = val # @next = nil # end # end # @param {ListNode} head # @return {ListNode} def swap_pairs(head) return head if head.next == nil current_node = head next_node = current_node.next head = next_node while current_node && next_node next_first_node = next_node.next current_node.next = next_node.next.next ? next_node.next.next : next_node.next next_node.next = current_node
<|file_sep|>original/024_swap_nodes_in_pairs.rb <|file_sep|>current/024_swap_nodes_in_pairs.rb <|file_sep|>updated/024_swap_nodes_in_pairs.rb # Definition for singly-linked list. # class ListNode # attr_accessor :val, :next # def initialize(val) # @val = val # @next = nil # end # end # @param {ListNode} head # @return {ListNode} def swap_pairs(head) return head if head.next == nil current_node = head next_node = current_node.next head = next_node while current_node && next_node next_first_node = next_node.next current_node.next = next_node.next.next ? next_node.next.next : next_node.next next_node.next = current_node
c1b36013fab114346b100cf40b673f03687f4f4f
024_swap_nodes_in_pairs.rb
024_swap_nodes_in_pairs.rb
Ruby
<|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: import java.util.List; updated: <|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: import com.basho.riak.client.core.RiakNode; updated: import com.basho.riak.client.core.operations.PingOperation; <|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: final List<RiakNode> nodes = client.getRiakCluster().getNodes(); if (!nodes.isEmpty()) { return Result.healthy(); updated: final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); <|file_sep|>original/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java private final RiakClient client; /** * Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final List<RiakNode> nodes = client.getRiakCluster().getNodes(); if (!nodes.isEmpty()) { return Result.healthy(); } return Result.unhealthy("No available Riak nodes"); } } <|file_sep|>current/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java * Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); } return Result.unhealthy("No available Riak nodes"); } } <|file_sep|>updated/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java
* Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); } return Result.unhealthy("Riak is down"); } }
<|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: import java.util.List; updated: <|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: import com.basho.riak.client.core.RiakNode; updated: import com.basho.riak.client.core.operations.PingOperation; <|file_sep|>notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java.diff original: final List<RiakNode> nodes = client.getRiakCluster().getNodes(); if (!nodes.isEmpty()) { return Result.healthy(); updated: final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); <|file_sep|>original/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java private final RiakClient client; /** * Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final List<RiakNode> nodes = client.getRiakCluster().getNodes(); if (!nodes.isEmpty()) { return Result.healthy(); } return Result.unhealthy("No available Riak nodes"); } } <|file_sep|>current/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java * Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); } return Result.unhealthy("No available Riak nodes"); } } <|file_sep|>updated/notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java * Constructor * * @param client * Riak client */ public RiakHealthCheck(@Nonnull final RiakClient client) { this.client = Objects.requireNonNull(client); } @Override protected Result check() throws Exception { final PingOperation ping = new PingOperation(); client.getRiakCluster().execute(ping); ping.await(); if (ping.isSuccess()) { return Result.healthy("Riak is healthly"); } return Result.unhealthy("Riak is down"); } }
1d525e1a1e5093469248d3e7a07d8e4e8456d601
notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java
notification-application/src/main/java/com/smoketurner/notification/application/health/RiakHealthCheck.java
Java
<|file_sep|>original/.travis.yml sudo: false language: java jdk: - openjdk11 - openjdk13 script: "./gradlew check --info --stacktrace" <|file_sep|>current/.travis.yml sudo: false language: java jdk: - openjdk11 - openjdk13 script: "./gradlew check --info --stacktrace" <|file_sep|>updated/.travis.yml
sudo: false language: java jdk: - openjdk11 - openjdk14 script: "./gradlew check --info --stacktrace"
<|file_sep|>original/.travis.yml sudo: false language: java jdk: - openjdk11 - openjdk13 script: "./gradlew check --info --stacktrace" <|file_sep|>current/.travis.yml sudo: false language: java jdk: - openjdk11 - openjdk13 script: "./gradlew check --info --stacktrace" <|file_sep|>updated/.travis.yml sudo: false language: java jdk: - openjdk11 - openjdk14 script: "./gradlew check --info --stacktrace"
e83312d310907965f1908c8b941c91b2e4b9ae7f
.travis.yml
.travis.yml
YAML
<|file_sep|>original/build.properties javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.4 commons-io.version=2.4 <|file_sep|>current/build.properties javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.4 commons-io.version=2.4 <|file_sep|>updated/build.properties
javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.6 commons-io.version=2.4
<|file_sep|>original/build.properties javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.4 commons-io.version=2.4 <|file_sep|>current/build.properties javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.4 commons-io.version=2.4 <|file_sep|>updated/build.properties javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.6 commons-io.version=2.4
7a4d0003e9bb6fd920bb879eaff1c24cd6f1f3e7
build.properties
build.properties
INI
<|file_sep|>original/index.js try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.log('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; } <|file_sep|>current/index.js try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.log('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; } <|file_sep|>updated/index.js
try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.error('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; }
<|file_sep|>original/index.js try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.log('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; } <|file_sep|>current/index.js try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.log('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; } <|file_sep|>updated/index.js try { module.exports = require('./build/Release/node_sleep.node'); } catch (e) { console.error('sleep: using busy loop fallback'); module.exports = { sleep: function(s) { var e = new Date().getTime() + (s * 1000); while (new Date().getTime() <= e) { ; } }, usleep: function(s) { var e = new Date().getTime() + (s / 1000); while (new Date().getTime() <= e) { ; }
3400709119be37c6f2a9be6efba3c2a00de4e349
index.js
index.js
JavaScript
<|file_sep|>original/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ///.*\/(.*\.#{KD.config.userSitesDomain})\/(.*)///, 'http://$1/$2' @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath <|file_sep|>current/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ///.*\/(.*\.#{KD.config.userSitesDomain})\/(.*)///, 'http://$1/$2' @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath <|file_sep|>updated/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee
class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ////home/(.*)/Web/(.*)///, "http://$1.#{KD.config.userSitesDomain}/$2" @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath
<|file_sep|>original/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ///.*\/(.*\.#{KD.config.userSitesDomain})\/(.*)///, 'http://$1/$2' @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath <|file_sep|>current/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ///.*\/(.*\.#{KD.config.userSitesDomain})\/(.*)///, 'http://$1/$2' @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath <|file_sep|>updated/client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee class NCopyUrlView extends JView constructor: -> super @path = FSHelper.plainPath @getData().path @publicPath = @path.replace \ ////home/(.*)/Web/(.*)///, "http://$1.#{KD.config.userSitesDomain}/$2" @inputUrlLabel = new KDLabelView cssClass : 'public-url-label' title : 'Public URL' click :=> @focusAndSelectAll() @inputUrl = new KDInputView label : @inputUrlLabel cssClass : 'public-url-input' @inputUrl.setValue @publicPath
6cce31310437c3f4656a1adbc44b1cdf86d71643
client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee
client/landing/app/MainApp/filetree/itemsubviews/copyurlview.coffee
CoffeeScript
<|file_sep|>original/ruby/gc_tweaks.zsh <|file_sep|>current/ruby/gc_tweaks.zsh <|file_sep|>updated/ruby/gc_tweaks.zsh
# Tweaks from Github export RUBY_HEAP_MIN_SLOTS=800000 export RUBY_HEAP_FREE_MIN=100000 export RUBY_HEAP_SLOTS_INCREMENT=300000 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 export RUBY_GC_MALLOC_LIMIT=79000000
<|file_sep|>original/ruby/gc_tweaks.zsh <|file_sep|>current/ruby/gc_tweaks.zsh <|file_sep|>updated/ruby/gc_tweaks.zsh # Tweaks from Github export RUBY_HEAP_MIN_SLOTS=800000 export RUBY_HEAP_FREE_MIN=100000 export RUBY_HEAP_SLOTS_INCREMENT=300000 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 export RUBY_GC_MALLOC_LIMIT=79000000
156e681224c99394c95e2af137a0aba91697a75b
ruby/gc_tweaks.zsh
ruby/gc_tweaks.zsh
Shell
<|file_sep|>google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java.diff original: * Base service exception. updated: * Base class for all service exceptions. <|file_sep|>original/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java this.code = code; this.retryable = retryable; } public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } public boolean retryable() { return retryable; } } <|file_sep|>current/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java this.code = code; this.retryable = retryable; } public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } public boolean retryable() { return retryable; } } <|file_sep|>updated/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java
public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } /** * Returns {@code true} when it is safe to retry the operation that caused this exception. */ public boolean retryable() { return retryable; } }
<|file_sep|>google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java.diff original: * Base service exception. updated: * Base class for all service exceptions. <|file_sep|>original/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java this.code = code; this.retryable = retryable; } public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } public boolean retryable() { return retryable; } } <|file_sep|>current/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java this.code = code; this.retryable = retryable; } public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } public boolean retryable() { return retryable; } } <|file_sep|>updated/google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java public BaseServiceException(int code, String message, boolean retryable, Exception cause) { super(message, cause); this.code = code; this.retryable = retryable; } /** * Returns the code associated with this exception. */ public int code() { return code; } /** * Returns {@code true} when it is safe to retry the operation that caused this exception. */ public boolean retryable() { return retryable; } }
e8160551cdfd4e220fb1fcf31af46fe01a587642
google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java
google-cloud-core/src/main/java/com/google/gcloud/BaseServiceException.java
Java
<|file_sep|>original/.travis.yml - conda update --yes conda install: - conda env create --file environment.yml - source activate py2_parcels - conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: - flake8 parcels - flake8 tests - flake8 parcels/examples - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - make linkcheck -C docs <|file_sep|>current/.travis.yml - conda update --yes conda install: - conda env create --file environment.yml - source activate py2_parcels - conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: - flake8 parcels - flake8 tests - flake8 parcels/examples - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - make linkcheck -C docs <|file_sep|>updated/.travis.yml
- conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start jobs: include: - script: - flake8 parcels - flake8 tests - flake8 parcels/examples - script: - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - script: - make linkcheck -C docs - 'ALLOW_FAIURE=true'
<|file_sep|>original/.travis.yml - conda update --yes conda install: - conda env create --file environment.yml - source activate py2_parcels - conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: - flake8 parcels - flake8 tests - flake8 parcels/examples - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - make linkcheck -C docs <|file_sep|>current/.travis.yml - conda update --yes conda install: - conda env create --file environment.yml - source activate py2_parcels - conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: - flake8 parcels - flake8 tests - flake8 parcels/examples - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - make linkcheck -C docs <|file_sep|>updated/.travis.yml - conda install --yes python=$TRAVIS_PYTHON_VERSION sphinx - pip install -e . before_script: # configure a headless display to test plot generation - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start jobs: include: - script: - flake8 parcels - flake8 tests - flake8 parcels/examples - script: - parcels_get_examples examples/ - py.test -v -s tests/ - py.test -v -s --nbval-lax examples/ - script: - make linkcheck -C docs - 'ALLOW_FAIURE=true'
c23d18c9e771deb5fb4e26937fbe22ccebd8b1a8
.travis.yml
.travis.yml
YAML
<|file_sep|>lib/rake/cloneable.rb.diff original: # Clone an object by making a new object and setting all the instance # variables to the same values. def dup sibling = self.class.new instance_variables.each do |ivar| value = self.instance_variable_get(ivar) new_value = value.clone rescue value sibling.instance_variable_set(ivar, new_value) updated: # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) <|file_sep|>original/lib/rake/cloneable.rb # module Cloneable # Clone an object by making a new object and setting all the instance # variables to the same values. def dup sibling = self.class.new instance_variables.each do |ivar| value = self.instance_variable_get(ivar) new_value = value.clone rescue value sibling.instance_variable_set(ivar, new_value) end sibling.taint if tainted? sibling end def clone sibling = dup sibling.freeze if frozen? sibling end end <|file_sep|>current/lib/rake/cloneable.rb # module Cloneable # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) end sibling.taint if tainted? sibling end def clone sibling = dup sibling.freeze if frozen? sibling end end end <|file_sep|>updated/lib/rake/cloneable.rb
module Rake # ########################################################################## # Mixin for creating easily cloned objects. # module Cloneable # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) end end end end
<|file_sep|>lib/rake/cloneable.rb.diff original: # Clone an object by making a new object and setting all the instance # variables to the same values. def dup sibling = self.class.new instance_variables.each do |ivar| value = self.instance_variable_get(ivar) new_value = value.clone rescue value sibling.instance_variable_set(ivar, new_value) updated: # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) <|file_sep|>original/lib/rake/cloneable.rb # module Cloneable # Clone an object by making a new object and setting all the instance # variables to the same values. def dup sibling = self.class.new instance_variables.each do |ivar| value = self.instance_variable_get(ivar) new_value = value.clone rescue value sibling.instance_variable_set(ivar, new_value) end sibling.taint if tainted? sibling end def clone sibling = dup sibling.freeze if frozen? sibling end end <|file_sep|>current/lib/rake/cloneable.rb # module Cloneable # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) end sibling.taint if tainted? sibling end def clone sibling = dup sibling.freeze if frozen? sibling end end end <|file_sep|>updated/lib/rake/cloneable.rb module Rake # ########################################################################## # Mixin for creating easily cloned objects. # module Cloneable # The hook that invoked by 'clone' and 'dup' methods. def initialize_copy(source) super source.instance_variables.each do |var| src_value = source.instance_variable_get(var) value = src_value.clone rescue src_value instance_variable_set(var, value) end end end end
ea68e7e7e48d09e1ed8f2f82255e9ae8388a1cd3
lib/rake/cloneable.rb
lib/rake/cloneable.rb
Ruby
<|file_sep|>security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java.diff original: TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"); updated: TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"), DISABLED("tls_client_tls_server"); <|file_sep|>original/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java public enum MixedMode { PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"), TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"); final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst() .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue)); } } <|file_sep|>current/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"), TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"), DISABLED("tls_client_tls_server"); final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst() .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue)); } } <|file_sep|>updated/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } /** * @return Default value when mixed mode is not explicitly specified */ public static MixedMode defaultValue() { return DISABLED; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst()
<|file_sep|>security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java.diff original: TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"); updated: TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"), DISABLED("tls_client_tls_server"); <|file_sep|>original/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java public enum MixedMode { PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"), TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"); final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst() .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue)); } } <|file_sep|>current/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"), TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"), DISABLED("tls_client_tls_server"); final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst() .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue)); } } <|file_sep|>updated/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java final String configValue; MixedMode(String configValue) { this.configValue = configValue; } public String configValue() { return configValue; } /** * @return Default value when mixed mode is not explicitly specified */ public static MixedMode defaultValue() { return DISABLED; } static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) .findFirst()
a294ea80e95e8469031997ad40fbb3fa5e5eb658
security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
Java
<|file_sep|>original/spec/events/turn_ended_spec.rb require 'rails_helper' RSpec.describe TurnEnded, type: :event do pending "Test expecting dice roll and not" pending "Test our turn or not" end <|file_sep|>current/spec/events/turn_ended_spec.rb require 'rails_helper' RSpec.describe TurnEnded, type: :event do pending "Test expecting dice roll and not" pending "Test our turn or not" end <|file_sep|>updated/spec/events/turn_ended_spec.rb
require 'rails_helper' RSpec.describe TurnEnded, type: :event do let(:game_state) do instance_double("GameState").tap do |game_state| end end subject(:event) { TurnEnded.new } let(:amount) { nil } describe "checking validity" do before do expect(game_state).to receive(:expecting_rolls).and_return(expecting_rolls) end context "when we are required to roll the dice" do let(:expecting_rolls) { 2 }
<|file_sep|>original/spec/events/turn_ended_spec.rb require 'rails_helper' RSpec.describe TurnEnded, type: :event do pending "Test expecting dice roll and not" pending "Test our turn or not" end <|file_sep|>current/spec/events/turn_ended_spec.rb require 'rails_helper' RSpec.describe TurnEnded, type: :event do pending "Test expecting dice roll and not" pending "Test our turn or not" end <|file_sep|>updated/spec/events/turn_ended_spec.rb require 'rails_helper' RSpec.describe TurnEnded, type: :event do let(:game_state) do instance_double("GameState").tap do |game_state| end end subject(:event) { TurnEnded.new } let(:amount) { nil } describe "checking validity" do before do expect(game_state).to receive(:expecting_rolls).and_return(expecting_rolls) end context "when we are required to roll the dice" do let(:expecting_rolls) { 2 }
9d13dec113114c07d5b9ba86fb37d8f8f05f33ab
spec/events/turn_ended_spec.rb
spec/events/turn_ended_spec.rb
Ruby
<|file_sep|>original/.scrutinizer.yml tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true duplication: true <|file_sep|>current/.scrutinizer.yml tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true duplication: true <|file_sep|>updated/.scrutinizer.yml
tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true
<|file_sep|>original/.scrutinizer.yml tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true duplication: true <|file_sep|>current/.scrutinizer.yml tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true duplication: true <|file_sep|>updated/.scrutinizer.yml tools: external_code_coverage: true php_code_sniffer: config: standard: "PSR2" checks: php: code_rating: true
e05b76814ba9a8fc8941a9984f314a4c86aa95c4
.scrutinizer.yml
.scrutinizer.yml
YAML
<|file_sep|>original/db/seeds.rb 25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.sentence cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end <|file_sep|>current/db/seeds.rb 25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.sentence cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end <|file_sep|>updated/db/seeds.rb
25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.paragraph(3, true, 3) cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end
<|file_sep|>original/db/seeds.rb 25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.sentence cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end <|file_sep|>current/db/seeds.rb 25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.sentence cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end <|file_sep|>updated/db/seeds.rb 25.times do |n| email = Faker::Internet.unique.safe_email password = "password" password_confirmation = "password" user = User.create!(email: email, password: password, password_confirmation: password) restaurant_name = Faker::Company.name content = Faker::Lorem.paragraph(3, true, 3) cuisine_name = ["Upscale", "American", "Fast Food", "Chinese", "Mexican", "Steak", "Pizza", "Deli", "Burgers"].sample review_cuisine = Cuisine.find_or_create_by :name => cuisine_name date_visited = Faker::Date.backward(125) rating = ["Excellent", "Good", "Average", "Poor"].sample Review.create!(user: user, :cuisines => [review_cuisine], restaurant_name: restaurant_name, content: content, date_visited: date_visited, rating: rating) end
892f5fe1ec0c043d2448845160896b2f21468ab4
db/seeds.rb
db/seeds.rb
Ruby
<|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: updated: <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: $this->storageDirectory = rtrim($storageDirectory, '\\/') . DIRECTORY_SEPARATOR; updated: $this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: updated: <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: if( !file_exists( $this->pathTo($id) ) ) { updated: if (!file_exists($this->pathTo($id))) { <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: return json_decode( file_get_contents($this->pathTo($id) )); updated: return json_decode(file_get_contents($this->pathTo($id))); <|file_sep|>original/src/Igorw/Trashbin/FileStorage.php $this->storageDirectory = rtrim($storageDirectory, '\\/') . DIRECTORY_SEPARATOR; } public function get($id) { if( !file_exists( $this->pathTo($id) ) ) { return false; } return json_decode( file_get_contents($this->pathTo($id) )); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory . $id . '.json'; } } <|file_sep|>current/src/Igorw/Trashbin/FileStorage.php $this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; } public function get($id) { if (!file_exists($this->pathTo($id))) { return false; } return json_decode(file_get_contents($this->pathTo($id))); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory . $id . '.json'; } } <|file_sep|>updated/src/Igorw/Trashbin/FileStorage.php
$this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; } public function get($id) { if (!file_exists($this->pathTo($id))) { return false; } return json_decode(file_get_contents($this->pathTo($id))); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory.$id.'.json'; } }
<|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: updated: <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: $this->storageDirectory = rtrim($storageDirectory, '\\/') . DIRECTORY_SEPARATOR; updated: $this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: updated: <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: if( !file_exists( $this->pathTo($id) ) ) { updated: if (!file_exists($this->pathTo($id))) { <|file_sep|>src/Igorw/Trashbin/FileStorage.php.diff original: return json_decode( file_get_contents($this->pathTo($id) )); updated: return json_decode(file_get_contents($this->pathTo($id))); <|file_sep|>original/src/Igorw/Trashbin/FileStorage.php $this->storageDirectory = rtrim($storageDirectory, '\\/') . DIRECTORY_SEPARATOR; } public function get($id) { if( !file_exists( $this->pathTo($id) ) ) { return false; } return json_decode( file_get_contents($this->pathTo($id) )); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory . $id . '.json'; } } <|file_sep|>current/src/Igorw/Trashbin/FileStorage.php $this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; } public function get($id) { if (!file_exists($this->pathTo($id))) { return false; } return json_decode(file_get_contents($this->pathTo($id))); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory . $id . '.json'; } } <|file_sep|>updated/src/Igorw/Trashbin/FileStorage.php $this->storageDirectory = rtrim($storageDirectory, '\\/').'/'; } public function get($id) { if (!file_exists($this->pathTo($id))) { return false; } return json_decode(file_get_contents($this->pathTo($id))); } public function set($id, array $value) { return file_put_contents($this->pathTo($id), json_encode($value)) !== false; } private function pathTo($id) { return $this->storageDirectory.$id.'.json'; } }
e87f65b1899b0194282cfdd2903a332a70ef5b26
src/Igorw/Trashbin/FileStorage.php
src/Igorw/Trashbin/FileStorage.php
PHP
<|file_sep|>original/config-example.py SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "Company" <|file_sep|>current/config-example.py SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "Company" <|file_sep|>updated/config-example.py
SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "All Company"
<|file_sep|>original/config-example.py SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "Company" <|file_sep|>current/config-example.py SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "Company" <|file_sep|>updated/config-example.py SECRET_KEY = 'YOUR_SECRET_HERE' # Use default theme THEME = 'default' # Every employee needs a reference to a Google Account. This reference is based on the users # Google Account email address and created when employee data is imported: we take the *username* # and this DOMAIN DOMAIN = 'example.com' # Name of the S3 bucket used to import employee data from a file named employees.json # Check out /import/employees.json.example to see how this file should look like. S3_BUCKET = 'employees' # When do we use Gravatar? Options are: # * 'always' - prefers Gravatar over the Employee.photo_url # * 'backup' - use Gravatar when photo_url is empty # * anything else - disabled GRAVATAR = 'backup' ORG_TITLE = "All Company"
1ef0e4db1079995b5dd6a013d3fa51c1b61db178
config-example.py
config-example.py
Python
<|file_sep|>original/git/docker-entrypoint.sh #!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@" <|file_sep|>current/git/docker-entrypoint.sh #!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@" <|file_sep|>updated/git/docker-entrypoint.sh
#!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|tsdb|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@"
<|file_sep|>original/git/docker-entrypoint.sh #!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@" <|file_sep|>current/git/docker-entrypoint.sh #!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@" <|file_sep|>updated/git/docker-entrypoint.sh #!/bin/bash set -e # first check if we're passing flags, if so # prepend with sentry if [ "${1:0:1}" = '-' ]; then set -- sentry "$@" fi case "$1" in celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|shell|start|tsdb|upgrade) set -- sentry "$@" ;; generate-secret-key) exec sentry config generate-secret-key ;; esac exec "$@"
ce9d2589cf97557298b8cd69d290426bca4f06dc
git/docker-entrypoint.sh
git/docker-entrypoint.sh
Shell
<|file_sep|>original/go-age_test.go package goage import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates { <|file_sep|>current/go-age_test.go package goage import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates { <|file_sep|>updated/go-age_test.go
package "go-age" import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates {
<|file_sep|>original/go-age_test.go package goage import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates { <|file_sep|>current/go-age_test.go package goage import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates { <|file_sep|>updated/go-age_test.go package "go-age" import ( "testing" "time" ) type AgeTestCandidate struct { BirthDate time.Time CheckingTime time.Time ExpectedAge int } var AgeTestCandidates = []AgeTestCandidate{ {time.Date(2000, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2010, 3, 14, 0, 0, 0, 0, time.UTC), 10}, {time.Date(2001, 3, 14, 0, 0, 0, 0, time.UTC), time.Date(2009, 3, 14, 0, 0, 0, 0, time.UTC), 8}, {time.Date(2004, 6, 18, 0, 0, 0, 0, time.UTC), time.Date(2005, 5, 12, 0, 0, 0, 0, time.UTC), 0}, } func TestAgeAt(t *testing.T) { for _, candidate := range AgeTestCandidates {
23dd91036aaad0bde8cccbf15ecb6d8a4047efee
go-age_test.go
go-age_test.go
Go
<|file_sep|>scripts/vagrant/freebsd/README.md.diff original: cd /elektra updated: ls /elektra <|file_sep|>original/scripts/vagrant/freebsd/README.md ```sh cd scripts/vagrant/freebsd ``` 4. Create and configure the guest machine: ```sh vagrant up ``` 5. Log into the virtual machine with SSH: ```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh cd /elektra ``` <|file_sep|>current/scripts/vagrant/freebsd/README.md ```sh cd scripts/vagrant/freebsd ``` 4. Create and configure the guest machine: ```sh vagrant up ``` 5. Log into the virtual machine with SSH: ```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh ls /elektra ``` <|file_sep|>updated/scripts/vagrant/freebsd/README.md
```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh ls /elektra ``` 7. To keep the folder `/elektra` in the virtual machine and the repository on the host computer in sync you can use the following command: ```sh vagrant rsync-auto ``` 8. After you logged into the virtual machine you can configure and build Elektra: ```sh mkdir build
<|file_sep|>scripts/vagrant/freebsd/README.md.diff original: cd /elektra updated: ls /elektra <|file_sep|>original/scripts/vagrant/freebsd/README.md ```sh cd scripts/vagrant/freebsd ``` 4. Create and configure the guest machine: ```sh vagrant up ``` 5. Log into the virtual machine with SSH: ```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh cd /elektra ``` <|file_sep|>current/scripts/vagrant/freebsd/README.md ```sh cd scripts/vagrant/freebsd ``` 4. Create and configure the guest machine: ```sh vagrant up ``` 5. Log into the virtual machine with SSH: ```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh ls /elektra ``` <|file_sep|>updated/scripts/vagrant/freebsd/README.md ```sh vagrant ssh ``` 6. The root of the repository is accessible via `/elektra` in the guest machine: ```sh ls /elektra ``` 7. To keep the folder `/elektra` in the virtual machine and the repository on the host computer in sync you can use the following command: ```sh vagrant rsync-auto ``` 8. After you logged into the virtual machine you can configure and build Elektra: ```sh mkdir build
8b97465389ff0b26493be8e721bfc8998fa69c62
scripts/vagrant/freebsd/README.md
scripts/vagrant/freebsd/README.md
Markdown
<|file_sep|>original/node-iterator-shim.js export default function createNodeIterator(root, whatToShow, filter = null) { var iter = _create.call(window.document, root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: { get: () => iter.filter <|file_sep|>current/node-iterator-shim.js export default function createNodeIterator(root, whatToShow, filter = null) { var iter = _create.call(window.document, root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: { get: () => iter.filter <|file_sep|>updated/node-iterator-shim.js
export default function createNodeIterator(root, whatToShow, filter = null) { let document = root.ownerDocument; var iter = document.createNodeIterator(root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: {
<|file_sep|>original/node-iterator-shim.js export default function createNodeIterator(root, whatToShow, filter = null) { var iter = _create.call(window.document, root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: { get: () => iter.filter <|file_sep|>current/node-iterator-shim.js export default function createNodeIterator(root, whatToShow, filter = null) { var iter = _create.call(window.document, root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: { get: () => iter.filter <|file_sep|>updated/node-iterator-shim.js export default function createNodeIterator(root, whatToShow, filter = null) { let document = root.ownerDocument; var iter = document.createNodeIterator(root, whatToShow, filter, false); return typeof(iter.referenceNode) === 'undefined' ? shim(iter, root) : iter; } function shim(iter, root) { var _referenceNode = root; var _pointerBeforeReferenceNode = true; return Object.create(NodeIterator.prototype, { root: { get: () => iter.root }, whatToShow: { get: () => iter.whatToShow }, filter: {
5c6f950fcfba27fc913af5392d222400dcceee2f
node-iterator-shim.js
node-iterator-shim.js
JavaScript
<|file_sep|>original/javascript/package.json ], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.0", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test" <|file_sep|>current/javascript/package.json ], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.0", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test" <|file_sep|>updated/javascript/package.json
], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.1", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test"
<|file_sep|>original/javascript/package.json ], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.0", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test" <|file_sep|>current/javascript/package.json ], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.0", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test" <|file_sep|>updated/javascript/package.json ], "author": "Aslak Hellesøy", "license": "MIT", "bugs": { "url": "https://github.com/cucumber/cucumber/issues" }, "homepage": "https://github.com/cucumber/gherkin-javascript", "devDependencies": { "@types/mocha": "9.1.0", "@types/node": "16.11.25", "core-js": "3.21.1", "mocha": "9.2.0", "ts-node": "10.5.0", "typescript": "4.5.5" }, "dependencies": { "@cucumber/messages": "^17.1.1", "@cucumber/message-streams": "^3.0.0" }, "directories": { "test": "test"
3683e2fe9d12eb70c9b495f57803b8213afd0724
javascript/package.json
javascript/package.json
JSON
<|file_sep|>client/lib/cordova/keyboard-fix.coffee.diff original: if device.platform.toLowerCase() isnt 'android' document.addEventListener 'deviceready', -> updated: document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' <|file_sep|>client/lib/cordova/keyboard-fix.coffee.diff original: window.addEventListener 'native.keyboardshow', -> updated: window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' <|file_sep|>original/client/lib/cordova/keyboard-fix.coffee if Meteor.isCordova if device.platform.toLowerCase() isnt 'android' document.addEventListener 'deviceready', -> cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> $('.main-content').css 'height', window.innerHeight <|file_sep|>current/client/lib/cordova/keyboard-fix.coffee if Meteor.isCordova document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> $('.main-content').css 'height', window.innerHeight <|file_sep|>updated/client/lib/cordova/keyboard-fix.coffee
if Meteor.isCordova document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight
<|file_sep|>client/lib/cordova/keyboard-fix.coffee.diff original: if device.platform.toLowerCase() isnt 'android' document.addEventListener 'deviceready', -> updated: document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' <|file_sep|>client/lib/cordova/keyboard-fix.coffee.diff original: window.addEventListener 'native.keyboardshow', -> updated: window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' <|file_sep|>original/client/lib/cordova/keyboard-fix.coffee if Meteor.isCordova if device.platform.toLowerCase() isnt 'android' document.addEventListener 'deviceready', -> cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> $('.main-content').css 'height', window.innerHeight <|file_sep|>current/client/lib/cordova/keyboard-fix.coffee if Meteor.isCordova document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> $('.main-content').css 'height', window.innerHeight <|file_sep|>updated/client/lib/cordova/keyboard-fix.coffee if Meteor.isCordova document.addEventListener 'deviceready', -> if device?.platform.toLowerCase() isnt 'android' cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.disableScroll(true); window.addEventListener 'native.keyboardshow', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight window.addEventListener 'native.keyboardhide', -> if device?.platform.toLowerCase() isnt 'android' $('.main-content').css 'height', window.innerHeight
8fe46adc0c550e2e370c7e43861801a8c71982cd
client/lib/cordova/keyboard-fix.coffee
client/lib/cordova/keyboard-fix.coffee
CoffeeScript
<|file_sep|>src/main/java/ch/rasc/eds/starter/util/QueryUtil.java.diff original: updated: import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; <|file_sep|>src/main/java/ch/rasc/eds/starter/util/QueryUtil.java.diff original: updated: import com.mongodb.client.FindIterable; <|file_sep|>original/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java import ch.ralscha.extdirectspring.bean.ExtDirectStoreReadRequest; import ch.ralscha.extdirectspring.bean.SortDirection; import ch.ralscha.extdirectspring.bean.SortInfo; public abstract class QueryUtil { public static List<Bson> getSorts(ExtDirectStoreReadRequest request) { List<Bson> sorts = new ArrayList<>(); for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } } <|file_sep|>current/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java import ch.ralscha.extdirectspring.bean.ExtDirectStoreReadRequest; import ch.ralscha.extdirectspring.bean.SortDirection; import ch.ralscha.extdirectspring.bean.SortInfo; public abstract class QueryUtil { public static List<Bson> getSorts(ExtDirectStoreReadRequest request) { List<Bson> sorts = new ArrayList<>(); for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } } <|file_sep|>updated/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java
for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } public static <T> List<T> toList(FindIterable<T> iterable) { return StreamSupport.stream(iterable.spliterator(), false) .collect(Collectors.toList()); } public static <T> Stream<T> stream(FindIterable<T> iterable) { return StreamSupport.stream(iterable.spliterator(), false); } }
<|file_sep|>src/main/java/ch/rasc/eds/starter/util/QueryUtil.java.diff original: updated: import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; <|file_sep|>src/main/java/ch/rasc/eds/starter/util/QueryUtil.java.diff original: updated: import com.mongodb.client.FindIterable; <|file_sep|>original/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java import ch.ralscha.extdirectspring.bean.ExtDirectStoreReadRequest; import ch.ralscha.extdirectspring.bean.SortDirection; import ch.ralscha.extdirectspring.bean.SortInfo; public abstract class QueryUtil { public static List<Bson> getSorts(ExtDirectStoreReadRequest request) { List<Bson> sorts = new ArrayList<>(); for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } } <|file_sep|>current/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java import ch.ralscha.extdirectspring.bean.ExtDirectStoreReadRequest; import ch.ralscha.extdirectspring.bean.SortDirection; import ch.ralscha.extdirectspring.bean.SortInfo; public abstract class QueryUtil { public static List<Bson> getSorts(ExtDirectStoreReadRequest request) { List<Bson> sorts = new ArrayList<>(); for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } } <|file_sep|>updated/src/main/java/ch/rasc/eds/starter/util/QueryUtil.java for (SortInfo sortInfo : request.getSorters()) { if (sortInfo.getDirection() == SortDirection.ASCENDING) { sorts.add(Sorts.ascending(sortInfo.getProperty())); } else { sorts.add(Sorts.descending(sortInfo.getProperty())); } } return sorts; } public static <T> List<T> toList(FindIterable<T> iterable) { return StreamSupport.stream(iterable.spliterator(), false) .collect(Collectors.toList()); } public static <T> Stream<T> stream(FindIterable<T> iterable) { return StreamSupport.stream(iterable.spliterator(), false); } }
c8ec1c2de4ad9ae92725d7158d8a672fc6f750f4
src/main/java/ch/rasc/eds/starter/util/QueryUtil.java
src/main/java/ch/rasc/eds/starter/util/QueryUtil.java
Java
<|file_sep|>manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml.diff original: value: medium updated: value: large <|file_sep|>original/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: medium - type: replace path: /instance_groups/name=log-api/vm_type value: medium - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium <|file_sep|>current/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: large - type: replace path: /instance_groups/name=log-api/vm_type value: medium - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium <|file_sep|>updated/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml
path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: large - type: replace path: /instance_groups/name=log-api/vm_type value: large - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium
<|file_sep|>manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml.diff original: value: medium updated: value: large <|file_sep|>original/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: medium - type: replace path: /instance_groups/name=log-api/vm_type value: medium - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium <|file_sep|>current/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: large - type: replace path: /instance_groups/name=log-api/vm_type value: medium - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium <|file_sep|>updated/manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml path: /instance_groups/name=consul/vm_type value: small - type: replace path: /instance_groups/name=diego-api/vm_type value: medium - type: replace path: /instance_groups/name=doppler/vm_type value: large - type: replace path: /instance_groups/name=log-api/vm_type value: large - type: replace path: /instance_groups/name=nats/vm_type value: medium - type: replace path: /instance_groups/name=scheduler/vm_type value: medium - type: replace path: /instance_groups/name=uaa/vm_type value: medium
7b0ab7b4ff1a000be0ae4bf097806dac62476a4c
manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml
manifests/cf-manifest/operations.d/100-cf-update-vm-types.yml
YAML
<|file_sep|>original/src/main/resources/application.properties spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log <|file_sep|>current/src/main/resources/application.properties spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log <|file_sep|>updated/src/main/resources/application.properties
spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %L %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log
<|file_sep|>original/src/main/resources/application.properties spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log <|file_sep|>current/src/main/resources/application.properties spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log <|file_sep|>updated/src/main/resources/application.properties spring.data.cassandra.keyspace-name=sample logging.level.org.springframework.web=ERROR logging.level.org.jmade=DEBUG logging.level.org.apache.kafka=ERROR logging.level.org.apache.zookeeper=ERROR # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %L %logger{36} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n logging.file=/Users/Alex/jmade.log #logging.file=${java.io.tmpdir}/jmade.log
f80faf985d3f8abf8d7772008a4f0aa72c379351
src/main/resources/application.properties
src/main/resources/application.properties
INI
<|file_sep|>original/Demo/Program.cs using System; using System.Collections.Generic; using Demo.Endpoints; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null } }; <|file_sep|>current/Demo/Program.cs using System; using System.Collections.Generic; using Demo.Endpoints; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null } }; <|file_sep|>updated/Demo/Program.cs
using System; using System.Collections.Generic; using Demo.Endpoints.FileSystem; using Demo.Endpoints.Sharepoint; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null }
<|file_sep|>original/Demo/Program.cs using System; using System.Collections.Generic; using Demo.Endpoints; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null } }; <|file_sep|>current/Demo/Program.cs using System; using System.Collections.Generic; using Demo.Endpoints; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null } }; <|file_sep|>updated/Demo/Program.cs using System; using System.Collections.Generic; using Demo.Endpoints.FileSystem; using Demo.Endpoints.Sharepoint; using Distributor; namespace Demo { internal class Program { private static void Main(string[] args) { var distributables = new List<DistributableFile> { new DistributableFile { Id = Guid.NewGuid(), ProfileName = "TestProfile", Name = "test.pdf", Contents = null }
2959a622fbca88acb7c2df638c43bea4ecf372ad
Demo/Program.cs
Demo/Program.cs
C#
<|file_sep|>spec/sse_spec.rb.diff original: describe "w3c dawg SPARQL evaluation tests" do updated: describe "w3c dawg SPARQL tests to SSE" do <|file_sep|>original/spec/sse_spec.rb SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end else it "??? #{t.name}" do puts t.inspect fail "Unknown test type #{t.type}" end end end end end end end <|file_sep|>current/spec/sse_spec.rb SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end else it "??? #{t.name}" do puts t.inspect fail "Unknown test type #{t.type}" end end end end end end end <|file_sep|>updated/spec/sse_spec.rb
SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end it "parses #{t.name} to lexically equivalent SSE" do query = SPARQL::Grammar.parse(t.action.query_string) normalized_query = query.to_sxp. gsub(/\s+/m, " "). gsub(/\(\s+\(/, '(('). gsub(/\)\s+\)/, '))'). strip normalized_result = t.action.sse_string. gsub(/\s+/m, " "). gsub(/\(\s+\(/, '((').
<|file_sep|>spec/sse_spec.rb.diff original: describe "w3c dawg SPARQL evaluation tests" do updated: describe "w3c dawg SPARQL tests to SSE" do <|file_sep|>original/spec/sse_spec.rb SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end else it "??? #{t.name}" do puts t.inspect fail "Unknown test type #{t.type}" end end end end end end end <|file_sep|>current/spec/sse_spec.rb SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end else it "??? #{t.name}" do puts t.inspect fail "Unknown test type #{t.type}" end end end end end end end <|file_sep|>updated/spec/sse_spec.rb SPARQL::Spec.load_sparql1_0_tests.group_by(&:manifest).each do |man, tests| describe man.to_s.split("/")[-2] do tests.each do |t| case t.type when MF.QueryEvaluationTest it "parses #{t.name} to correct SSE" do query = SPARQL::Grammar.parse(t.action.query_string) sse = SPARQL::Algebra.parse(t.action.sse_string) query.should == sse end it "parses #{t.name} to lexically equivalent SSE" do query = SPARQL::Grammar.parse(t.action.query_string) normalized_query = query.to_sxp. gsub(/\s+/m, " "). gsub(/\(\s+\(/, '(('). gsub(/\)\s+\)/, '))'). strip normalized_result = t.action.sse_string. gsub(/\s+/m, " "). gsub(/\(\s+\(/, '((').
3040e1421007929b37bcacf73d1e585acc904249
spec/sse_spec.rb
spec/sse_spec.rb
Ruby
<|file_sep|>photoshell/__main__.py.diff original: updated: <|file_sep|>original/photoshell/__main__.py import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') with open(config_path, 'r') as config_file: config = yaml.load(config_file) print('Libray path is {0}'.format(config['library'])) # Open photo viewer ui.render(config['library']) <|file_sep|>current/photoshell/__main__.py import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') with open(config_path, 'r') as config_file: config = yaml.load(config_file) print('Libray path is {0}'.format(config['library'])) # Open photo viewer ui.render(config['library']) <|file_sep|>updated/photoshell/__main__.py
import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') config = dict( { 'library': os.path.join(os.environ['HOME'], 'Pictures/Photoshell') } ) if os.path.isfile(config_path): with open(config_path, 'r') as config_file: config = yaml.load(config_file) else: with open(config_path, 'w+') as config_file: yaml.dump(config, config_file, default_flow_style=False)
<|file_sep|>photoshell/__main__.py.diff original: updated: <|file_sep|>original/photoshell/__main__.py import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') with open(config_path, 'r') as config_file: config = yaml.load(config_file) print('Libray path is {0}'.format(config['library'])) # Open photo viewer ui.render(config['library']) <|file_sep|>current/photoshell/__main__.py import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') with open(config_path, 'r') as config_file: config = yaml.load(config_file) print('Libray path is {0}'.format(config['library'])) # Open photo viewer ui.render(config['library']) <|file_sep|>updated/photoshell/__main__.py import os import sys import yaml from photoshell import ui config_path = os.path.join(os.environ['HOME'], '.photoshell.yaml') config = dict( { 'library': os.path.join(os.environ['HOME'], 'Pictures/Photoshell') } ) if os.path.isfile(config_path): with open(config_path, 'r') as config_file: config = yaml.load(config_file) else: with open(config_path, 'w+') as config_file: yaml.dump(config, config_file, default_flow_style=False)
2d15ff38abb68335daa8bb2b94aaeff91ed829a2
photoshell/__main__.py
photoshell/__main__.py
Python
<|file_sep|>original/defaults/main.yml --- # file: roles/role-solr/defaults/main.yml solr_source: http://apache.openmirror.de/lucene/solr solr_version: 4.7.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}} <|file_sep|>current/defaults/main.yml --- # file: roles/role-solr/defaults/main.yml solr_source: http://apache.openmirror.de/lucene/solr solr_version: 4.7.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}} <|file_sep|>updated/defaults/main.yml
--- # file: roles/role-solr/defaults/main.yml solr_source: http://archive.apache.org/dist/lucene/solr/ solr_version: 4.9.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}}
<|file_sep|>original/defaults/main.yml --- # file: roles/role-solr/defaults/main.yml solr_source: http://apache.openmirror.de/lucene/solr solr_version: 4.7.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}} <|file_sep|>current/defaults/main.yml --- # file: roles/role-solr/defaults/main.yml solr_source: http://apache.openmirror.de/lucene/solr solr_version: 4.7.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}} <|file_sep|>updated/defaults/main.yml --- # file: roles/role-solr/defaults/main.yml solr_source: http://archive.apache.org/dist/lucene/solr/ solr_version: 4.9.0 solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}}
c96c13d21d6529fdb0c883774492de85c5a8eda7
defaults/main.yml
defaults/main.yml
YAML
<|file_sep|>original/dev-requirements.txt . # <- install ourselves coverage==6.3.2 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1 <|file_sep|>current/dev-requirements.txt . # <- install ourselves coverage==6.3.2 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1 <|file_sep|>updated/dev-requirements.txt
. # <- install ourselves coverage==6.3.3 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1
<|file_sep|>original/dev-requirements.txt . # <- install ourselves coverage==6.3.2 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1 <|file_sep|>current/dev-requirements.txt . # <- install ourselves coverage==6.3.2 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1 <|file_sep|>updated/dev-requirements.txt . # <- install ourselves coverage==6.3.3 flake8==4.0.1 pre-commit==2.19.0 tox==3.25.0 tox-gh-actions==2.9.1
5c2b98b2486fedb08fa0d15baa91ba3a47bfeeb2
dev-requirements.txt
dev-requirements.txt
Text
<|file_sep|>original/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM USER WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title; <|file_sep|>current/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM USER WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title; <|file_sep|>updated/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql
CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM user WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title;
<|file_sep|>original/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM USER WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title; <|file_sep|>current/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM USER WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title; <|file_sep|>updated/query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql CONNECT itwiki_p itwiki.labsdb; SELECT CONCAT('# [[', page_title, ']]') FROM page LEFT JOIN revision ON page_id = rev_page WHERE page_namespace = 0 AND rev_parent_id = 0 AND (rev_user = 0 OR rev_user IN (SELECT user_id FROM user WHERE user_editcount < 50)) AND page_id IN (SELECT tl_from FROM templatelinks LEFT JOIN page ON tl_from = page_id WHERE tl_title LIKE 'W') ORDER BY page_title;
f1e36c8cdd0a05022ff071a9fefc1db58ffd2942
query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql
query/itwiki/EGO/Voci/Voci_con_avviso_W_inserite_da_IP.sql
SQL
<|file_sep|>Casks/trailer.rb.diff original: url 'http://dev.housetrip.com/trailer/trailer1019.zip' updated: url 'http://dev.housetrip.com/trailer/trailer1026.zip' <|file_sep|>original/Casks/trailer.rb class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1019.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.19' sha256 '651b211c0c678de0719a6535a3c2be390cfd0d100108d310410efecae9eafd5f' link 'Trailer.app' end <|file_sep|>current/Casks/trailer.rb class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1026.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.19' sha256 '651b211c0c678de0719a6535a3c2be390cfd0d100108d310410efecae9eafd5f' link 'Trailer.app' end <|file_sep|>updated/Casks/trailer.rb
class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1026.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.26' sha256 '2cad2a5af786429d6917b22cd131e7425054f3792a284620902dcb985308aab8' link 'Trailer.app' end
<|file_sep|>Casks/trailer.rb.diff original: url 'http://dev.housetrip.com/trailer/trailer1019.zip' updated: url 'http://dev.housetrip.com/trailer/trailer1026.zip' <|file_sep|>original/Casks/trailer.rb class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1019.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.19' sha256 '651b211c0c678de0719a6535a3c2be390cfd0d100108d310410efecae9eafd5f' link 'Trailer.app' end <|file_sep|>current/Casks/trailer.rb class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1026.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.19' sha256 '651b211c0c678de0719a6535a3c2be390cfd0d100108d310410efecae9eafd5f' link 'Trailer.app' end <|file_sep|>updated/Casks/trailer.rb class Trailer < Cask url 'http://dev.housetrip.com/trailer/trailer1026.zip' homepage 'http://dev.housetrip.com/trailer/' version '1.0.26' sha256 '2cad2a5af786429d6917b22cd131e7425054f3792a284620902dcb985308aab8' link 'Trailer.app' end
fcf8d50c49171324383a9400bc48639c2f6d51cf
Casks/trailer.rb
Casks/trailer.rb
Ruby
<|file_sep|>types/pg-query-stream/pg-query-stream-tests.ts.diff original: pg.connect('', (err, client, done) => { updated: const pool = new pg.Pool(); pool.connect((err, client, done) => { <|file_sep|>original/types/pg-query-stream/pg-query-stream-tests.ts import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); pg.connect('', (err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); <|file_sep|>current/types/pg-query-stream/pg-query-stream-tests.ts import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); const pool = new pg.Pool(); pool.connect((err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); <|file_sep|>updated/types/pg-query-stream/pg-query-stream-tests.ts
import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); const pool = new pg.Pool(); pool.connect((err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); pool.end();
<|file_sep|>types/pg-query-stream/pg-query-stream-tests.ts.diff original: pg.connect('', (err, client, done) => { updated: const pool = new pg.Pool(); pool.connect((err, client, done) => { <|file_sep|>original/types/pg-query-stream/pg-query-stream-tests.ts import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); pg.connect('', (err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); <|file_sep|>current/types/pg-query-stream/pg-query-stream-tests.ts import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); const pool = new pg.Pool(); pool.connect((err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); <|file_sep|>updated/types/pg-query-stream/pg-query-stream-tests.ts import * as QueryStream from 'pg-query-stream'; import * as pg from 'pg'; const options: QueryStream.Options = { highWaterMark: 1000, batchSize: 100 }; const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [1000000], options); const pool = new pg.Pool(); pool.connect((err, client, done) => { const stream = client.query(query); stream.on('end', () => { client.end(); }); stream.on('data', (data: any) => { console.log(data); }); }); pool.end();
c03e601a5079f67aae15d2780e8c01d2136da18e
types/pg-query-stream/pg-query-stream-tests.ts
types/pg-query-stream/pg-query-stream-tests.ts
TypeScript
<|file_sep|>original/awx/main/management/commands/remove_instance.py self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('I cowardly refuse to remove the primary instance %s.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.') <|file_sep|>current/awx/main/management/commands/remove_instance.py self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('I cowardly refuse to remove the primary instance %s.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.') <|file_sep|>updated/awx/main/management/commands/remove_instance.py
self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('Can not remove primary instance %s. Another instance must be promoted to primary first.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.')
<|file_sep|>original/awx/main/management/commands/remove_instance.py self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('I cowardly refuse to remove the primary instance %s.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.') <|file_sep|>current/awx/main/management/commands/remove_instance.py self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('I cowardly refuse to remove the primary instance %s.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.') <|file_sep|>updated/awx/main/management/commands/remove_instance.py self.include_option_hostname_uuid_find() def handle(self, *args, **options): super(Command, self).handle(*args, **options) # Is there an existing record for this machine? If so, retrieve that record and look for issues. try: # Get the instance. instance = Instance.objects.get(**self.get_unique_fields()) # Sanity check: Do not remove the primary instance. if instance.primary: raise CommandError('Can not remove primary instance %s. Another instance must be promoted to primary first.' % instance_str(instance)) # Remove the instance. instance.delete() print('Successfully removed instance %s.' % instance_str(instance)) except Instance.DoesNotExist: print('No matching instance found to remove.')
237a66191295cce2cd52d78bcdb7cbe57e399e56
awx/main/management/commands/remove_instance.py
awx/main/management/commands/remove_instance.py
Python
<|file_sep|>package.json.diff original: "name": "hexo-tag-media", "version": "0.0.1", updated: "name": "hexo-tag-owl", "version": "0.0.2", <|file_sep|>original/package.json { "name": "hexo-tag-media", "version": "0.0.1", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-media.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*" <|file_sep|>current/package.json { "name": "hexo-tag-owl", "version": "0.0.2", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-media.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*" <|file_sep|>updated/package.json
{ "name": "hexo-tag-owl", "version": "0.0.2", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-owl.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*"
<|file_sep|>package.json.diff original: "name": "hexo-tag-media", "version": "0.0.1", updated: "name": "hexo-tag-owl", "version": "0.0.2", <|file_sep|>original/package.json { "name": "hexo-tag-media", "version": "0.0.1", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-media.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*" <|file_sep|>current/package.json { "name": "hexo-tag-owl", "version": "0.0.2", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-media.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*" <|file_sep|>updated/package.json { "name": "hexo-tag-owl", "version": "0.0.2", "description": "An tag about Hexo with media plug-in", "main": "index", "repository": { "type": "git", "url": "https://github.com/m80126colin/hexo-tag-owl.git" }, "keywords": [ "hexo", "blog", "niconico" ], "author": { "name": "Hsu Heng-Yu", "email": "m80126colin@gmail.com" }, "license": "MIT", "engines": { "hexo": "*"
536d07452877b957e2c0defd494cd37480f313b5
package.json
package.json
JSON
<|file_sep|>original/.travis.yml language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: npm test <|file_sep|>current/.travis.yml language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: npm test <|file_sep|>updated/.travis.yml
language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: make test
<|file_sep|>original/.travis.yml language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: npm test <|file_sep|>current/.travis.yml language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: npm test <|file_sep|>updated/.travis.yml language: node_js branches: only: - master node_js: - "0.10" - "0.11" script: make test
84fe27126c50143322a7ef6a9b497b30664232f3
.travis.yml
.travis.yml
YAML
<|file_sep|>scripts/upgrade.sh.diff original: OSAD_DIR='/opt/rpc-openstack/os-ansible-deployment' RPCD_DIR='/opt/rpc-openstack/rpcd' updated: BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" <|file_sep|>original/scripts/upgrade.sh # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail OSAD_DIR='/opt/rpc-openstack/os-ansible-deployment' RPCD_DIR='/opt/rpc-openstack/rpcd' # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${RPCD_DIR} ${RPCD_DIR}/scripts/deploy.sh <|file_sep|>current/scripts/upgrade.sh # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${RPCD_DIR} ${RPCD_DIR}/scripts/deploy.sh <|file_sep|>updated/scripts/upgrade.sh
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${BASE_DIR} ${BASE_DIR}/scripts/deploy.sh
<|file_sep|>scripts/upgrade.sh.diff original: OSAD_DIR='/opt/rpc-openstack/os-ansible-deployment' RPCD_DIR='/opt/rpc-openstack/rpcd' updated: BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" <|file_sep|>original/scripts/upgrade.sh # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail OSAD_DIR='/opt/rpc-openstack/os-ansible-deployment' RPCD_DIR='/opt/rpc-openstack/rpcd' # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${RPCD_DIR} ${RPCD_DIR}/scripts/deploy.sh <|file_sep|>current/scripts/upgrade.sh # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${RPCD_DIR} ${RPCD_DIR}/scripts/deploy.sh <|file_sep|>updated/scripts/upgrade.sh # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # (c) 2015, Nolan Brubaker <nolan.brubaker@rackspace.com> set -eux pipefail BASE_DIR=$( cd "$( dirname ${0} )" && cd ../ && pwd ) OSAD_DIR="$BASE_DIR/os-ansible-deployment" # Do the upgrade for os-ansible-deployment components cd ${OSAD_DIR} ${OSAD_DIR}/scripts/run-upgrade.sh # Prevent the deployment script from re-running the OSAD playbooks export DEPLOY_OSAD="no" # Do the upgrade for the RPC components source ${OSAD_DIR}/scripts/scripts-library.sh cd ${BASE_DIR} ${BASE_DIR}/scripts/deploy.sh
921a2b3ce81d8a7a41a28e328b04e999fb600a0d
scripts/upgrade.sh
scripts/upgrade.sh
Shell
<|file_sep|>original/finance/templates/base.html {% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html> <|file_sep|>current/finance/templates/base.html {% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html> <|file_sep|>updated/finance/templates/base.html
{% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> <!--[if lt IE 9]> <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script> <![endif]--> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html>
<|file_sep|>original/finance/templates/base.html {% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html> <|file_sep|>current/finance/templates/base.html {% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html> <|file_sep|>updated/finance/templates/base.html {% load pipeline %} {% load staticfiles %} <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>finance</title> {% stylesheet 'finance' %} <link rel="stylesheet" href="{% static "octicons/octicons.css" %}"> <!--[if lt IE 9]> <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script> <![endif]--> </head> <body> <div class="container"> {% block content %} {% endblock %} </div> </body> </html>
5278fded0d9ea9b8f8e85592325fc9f8ef0e0da6
finance/templates/base.html
finance/templates/base.html
HTML
<|file_sep|>hubbot/Modules/Healthcheck.py.diff original: from twisted.internet import reactor, protocol updated: from twisted.protocols import basic from twisted.internet import protocol, reactor <|file_sep|>hubbot/Modules/Healthcheck.py.diff original: class Echo(protocol.Protocol): """This is just about the simplest possible protocol""" def dataReceived(self, data): """As soon as any data is received, write it back.""" self.transport.write(data) updated: class HealthcheckProtocol(basic.LineReceiver): def lineReceived(self, line): response_body = "All is well. Ish." self.sendLine("HTTP/1.0 200 OK".encode("UTF-8")) self.sendLine("Content-Type: text/plain".encode("UTF-8")) self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() <|file_sep|>original/hubbot/Modules/Healthcheck.py """As soon as any data is received, write it back.""" self.transport.write(data) class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = Echo super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message): return f"Hosts an HTTP healthcheck server on port {self.port}." <|file_sep|>current/hubbot/Modules/Healthcheck.py self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = Echo super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message): <|file_sep|>updated/hubbot/Modules/Healthcheck.py
self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = HealthcheckProtocol super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message):
<|file_sep|>hubbot/Modules/Healthcheck.py.diff original: from twisted.internet import reactor, protocol updated: from twisted.protocols import basic from twisted.internet import protocol, reactor <|file_sep|>hubbot/Modules/Healthcheck.py.diff original: class Echo(protocol.Protocol): """This is just about the simplest possible protocol""" def dataReceived(self, data): """As soon as any data is received, write it back.""" self.transport.write(data) updated: class HealthcheckProtocol(basic.LineReceiver): def lineReceived(self, line): response_body = "All is well. Ish." self.sendLine("HTTP/1.0 200 OK".encode("UTF-8")) self.sendLine("Content-Type: text/plain".encode("UTF-8")) self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() <|file_sep|>original/hubbot/Modules/Healthcheck.py """As soon as any data is received, write it back.""" self.transport.write(data) class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = Echo super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message): return f"Hosts an HTTP healthcheck server on port {self.port}." <|file_sep|>current/hubbot/Modules/Healthcheck.py self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = Echo super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message): <|file_sep|>updated/hubbot/Modules/Healthcheck.py self.sendLine(f"Content-Length: {len(response_body)}\n".encode("UTF-8")) self.transport.write(response_body) self.transport.loseConnection() class Healthcheck(ModuleInterface): port = 9999 def __init__(self, bot): self.healthcheck_server = protocol.ServerFactory() self.healthcheck_server.protocol = HealthcheckProtocol super().__init__(bot) def on_load(self): reactor.listenTCP(self.port, self.healthcheck_server) def on_unload(self): reactor.stopListening(self.port) def help(self, message):
7016b7bb026e0fe557ca06efa81dace9999e526d
hubbot/Modules/Healthcheck.py
hubbot/Modules/Healthcheck.py
Python
<|file_sep|>original/app/javascript/gobierto_people/modules/application.js $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); }); <|file_sep|>current/app/javascript/gobierto_people/modules/application.js $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); }); <|file_sep|>updated/app/javascript/gobierto_people/modules/application.js
import "tipsy-1a"; $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); });
<|file_sep|>original/app/javascript/gobierto_people/modules/application.js $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); }); <|file_sep|>current/app/javascript/gobierto_people/modules/application.js $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); }); <|file_sep|>updated/app/javascript/gobierto_people/modules/application.js import "tipsy-1a"; $(document).on('turbolinks:load', function() { $('.open-other-statements').click(function(e) { e.preventDefault(); $('.other-statements').toggle(); }); $('#people-filter li').click(function() { $('#people-filter li').removeClass('active'); $(this).addClass('active'); }); $(".tipsit").tipsy({ fade: false, gravity: "n", html: true }); });
773b51f5eb0c581744a10bba6ef9eac16f88f8aa
app/javascript/gobierto_people/modules/application.js
app/javascript/gobierto_people/modules/application.js
JavaScript
<|file_sep|>original/tests/phpunit/NotificationStructureTest.php <|file_sep|>current/tests/phpunit/NotificationStructureTest.php <|file_sep|>updated/tests/phpunit/NotificationStructureTest.php
<?php class NotificationStructureTest extends MediaWikiTestCase { /** * @coversNothing * @dataProvider provideNotificationTypes * * @param string $type * @param array $info */ public function testNotificationTypes( $type, array $info ) { if ( isset( $info['presentation-model'] ) ) { self::assertTrue( class_exists( $info['presentation-model'] ), "Presentation model class {$info['presentation-model']} for {$type} must exist" ); } if ( isset( $info['user-locators'] ) ) { $locators = $info['user-locators']; $locator = reset( $locators ); if ( is_array( $locator ) ) {
<|file_sep|>original/tests/phpunit/NotificationStructureTest.php <|file_sep|>current/tests/phpunit/NotificationStructureTest.php <|file_sep|>updated/tests/phpunit/NotificationStructureTest.php <?php class NotificationStructureTest extends MediaWikiTestCase { /** * @coversNothing * @dataProvider provideNotificationTypes * * @param string $type * @param array $info */ public function testNotificationTypes( $type, array $info ) { if ( isset( $info['presentation-model'] ) ) { self::assertTrue( class_exists( $info['presentation-model'] ), "Presentation model class {$info['presentation-model']} for {$type} must exist" ); } if ( isset( $info['user-locators'] ) ) { $locators = $info['user-locators']; $locator = reset( $locators ); if ( is_array( $locator ) ) {
e5e8de1ba69477ec7da87a97cc2c6930053cf84e
tests/phpunit/NotificationStructureTest.php
tests/phpunit/NotificationStructureTest.php
PHP
<|file_sep|>cyclobots/index.html.diff original: width: 80%; height: 80%; background: pink; updated: background: white; border: 1px solid blue; <|file_sep|>cyclobots/index.html.diff original: <body id="container"> updated: <body> <|file_sep|>cyclobots/index.html.diff original: updated: <div id="container"></div> <|file_sep|>original/cyclobots/index.html padding: 0; line-height: 1.5em; } canvas { width: 80%; height: 80%; background: pink; } </style> </head> <body id="container"> <header> <h1>Cyclobots</h1> </header> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container'); </script> <|file_sep|>current/cyclobots/index.html line-height: 1.5em; } canvas { background: white; border: 1px solid blue; } </style> </head> <body> <header> <h1>Cyclobots</h1> </header> <div id="container"></div> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container'); </script> <|file_sep|>updated/cyclobots/index.html
line-height: 1.5em; } canvas { background: white; border: 1px solid blue; } </style> </head> <body> <header> <h1>Cyclobots</h1> </header> <div id="container"></div> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container', { width: 640, height: 480 }); </script>
<|file_sep|>cyclobots/index.html.diff original: width: 80%; height: 80%; background: pink; updated: background: white; border: 1px solid blue; <|file_sep|>cyclobots/index.html.diff original: <body id="container"> updated: <body> <|file_sep|>cyclobots/index.html.diff original: updated: <div id="container"></div> <|file_sep|>original/cyclobots/index.html padding: 0; line-height: 1.5em; } canvas { width: 80%; height: 80%; background: pink; } </style> </head> <body id="container"> <header> <h1>Cyclobots</h1> </header> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container'); </script> <|file_sep|>current/cyclobots/index.html line-height: 1.5em; } canvas { background: white; border: 1px solid blue; } </style> </head> <body> <header> <h1>Cyclobots</h1> </header> <div id="container"></div> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container'); </script> <|file_sep|>updated/cyclobots/index.html line-height: 1.5em; } canvas { background: white; border: 1px solid blue; } </style> </head> <body> <header> <h1>Cyclobots</h1> </header> <div id="container"></div> </body> <script src="cyclobots.js"></script> <script> launch('yoob/', 'container', { width: 640, height: 480 }); </script>
75db08989935e88f7e94dc7b53c6dad050715315
cyclobots/index.html
cyclobots/index.html
HTML
<|file_sep|>src/Address/Bridge/Symfony/Form/Type/AddressType.php.diff original: ->add('dependentLocality', TextType::class) updated: ->add('dependentLocality', TextType::class, ['required' => false]) <|file_sep|>original/src/Address/Bridge/Symfony/Form/Type/AddressType.php /** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class); } } <|file_sep|>current/src/Address/Bridge/Symfony/Form/Type/AddressType.php /** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class, ['required' => false]) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class); } } <|file_sep|>updated/src/Address/Bridge/Symfony/Form/Type/AddressType.php
/** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class, ['required' => false]) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class, ['required' => false]); } }
<|file_sep|>src/Address/Bridge/Symfony/Form/Type/AddressType.php.diff original: ->add('dependentLocality', TextType::class) updated: ->add('dependentLocality', TextType::class, ['required' => false]) <|file_sep|>original/src/Address/Bridge/Symfony/Form/Type/AddressType.php /** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class); } } <|file_sep|>current/src/Address/Bridge/Symfony/Form/Type/AddressType.php /** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class, ['required' => false]) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class); } } <|file_sep|>updated/src/Address/Bridge/Symfony/Form/Type/AddressType.php /** * @author Adamo Crespi <hello@aerendir.me> */ class AddressType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('countryCode', CountryType::class, ['label' => 'address.form.country_code.label', 'translation_domain' => 'address']) ->add('administrativeArea', TextType::class) ->add('locality', TextType::class) ->add('dependentLocality', TextType::class, ['required' => false]) ->add('postalCode', TextType::class) ->add('street', TextType::class) ->add('extraLine', TextType::class, ['required' => false]); } }
0652ed83214c12b8a440c04048f07b8683cdfa3c
src/Address/Bridge/Symfony/Form/Type/AddressType.php
src/Address/Bridge/Symfony/Form/Type/AddressType.php
PHP
<|file_sep|>original/.travis.yml - oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: secure: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: <|file_sep|>current/.travis.yml - oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: secure: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: <|file_sep|>updated/.travis.yml
- oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: provider: pages
<|file_sep|>original/.travis.yml - oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: secure: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: <|file_sep|>current/.travis.yml - oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: secure: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: <|file_sep|>updated/.travis.yml - oraclejdk8 - oraclejdk9 - oraclejdk11 - openjdk8 - openjdk9 - openjdk10 - openjdk11 addons: sonarqube: organization: "viktorc-github" token: $SONAR_TOKEN install: true script: mvn clean jacoco:prepare-agent install jacoco:report sonar:sonar cache: directories: - $HOME/.m2 - $HOME/.sonar/cache notifications: email: false deploy: provider: pages
e80a2358ac17184e7da7cfe7c83b7dff37c39c86
.travis.yml
.travis.yml
YAML
<|file_sep|>original/scripts/templates/dashboardTodo.handlebars <div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: Cloud Orchestrator must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page. <|file_sep|>current/scripts/templates/dashboardTodo.handlebars <div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: Cloud Orchestrator must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page. <|file_sep|>updated/scripts/templates/dashboardTodo.handlebars
<div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: SAA Recipe must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page.
<|file_sep|>original/scripts/templates/dashboardTodo.handlebars <div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: Cloud Orchestrator must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page. <|file_sep|>current/scripts/templates/dashboardTodo.handlebars <div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: Cloud Orchestrator must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page. <|file_sep|>updated/scripts/templates/dashboardTodo.handlebars <div class="portlet span4"> <div class="header">To Do</div> <div class="portlet-content"> {{#if controllers.application.isConfigured}} <div class="alert alert-success"> There are no to do items. </div> {{else}} {{#if controllers.build.isReadycloud}} <div class="alert alert-info"> <strong>Note</strong>: SAA Recipe must be <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">configured</a> before before the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Go to <a {{bind-attr href="controllers.application.fuelUrl"}} target="_blank">Orchestration</a> and use the Fuel interface to set up your cloud. </div> {{else}} <div class="alert alert-info"> <strong>Note</strong>: Configuration files must be {{#link-to "settings.upload"}}uploaded{{/link-to}} before {{App.application.title}} may be started and the application becomes fully enabled. </div> <div class="alert alert-warning"> <strong>Instructions</strong>: Upload <code>nova.conf</code>, <code>openrc</code>, and <code>ovs_quantum_plugin.ini</code> from the {{#link-to "settings.upload"}}Upload{{/link-to}} page.
4762da71ebec332b7394cfbe778accc3cfd5bc59
scripts/templates/dashboardTodo.handlebars
scripts/templates/dashboardTodo.handlebars
Handlebars
<|file_sep|>original/roadie.gemspec Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib] <|file_sep|>current/roadie.gemspec Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib] <|file_sep|>updated/roadie.gemspec
Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.license = "MIT" s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib]
<|file_sep|>original/roadie.gemspec Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib] <|file_sep|>current/roadie.gemspec Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib] <|file_sep|>updated/roadie.gemspec Gem::Specification.new do |s| s.name = 'roadie' s.version = Roadie::VERSION s.platform = Gem::Platform::RUBY s.authors = ['Magnus Bergmark'] s.email = ['magnus.bergmark@gmail.com'] s.homepage = 'http://github.com/Mange/roadie' s.summary = %q{Making HTML emails comfortable for the Ruby rockstars} s.description = %q{Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you.} s.license = "MIT" s.required_ruby_version = ">= 1.9" s.add_dependency 'nokogiri', '~> 1.6.0' s.add_dependency 'css_parser', '~> 1.3.4' s.add_development_dependency 'rspec' s.extra_rdoc_files = %w[README.md Changelog.md] s.require_paths = %w[lib]
65640fcd1ac5cfd76b3b0a0823576938d86d6f1d
roadie.gemspec
roadie.gemspec
Ruby
<|file_sep|>example/style.css.diff original: color: green; updated: color: lawngreen; <|file_sep|>original/example/style.css .ng-promise-pending { color: orange; } .ng-promise-resolved { color: green; } .ng-promise-resolved.ng-promise-settled { color: greenyellow; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; } <|file_sep|>current/example/style.css .ng-promise-pending { color: orange; } .ng-promise-resolved { color: lawngreen; } .ng-promise-resolved.ng-promise-settled { color: greenyellow; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; } <|file_sep|>updated/example/style.css
.ng-promise-pending { color: orange; } .ng-promise-resolved { color: lawngreen; } .ng-promise-resolved.ng-promise-settled { color: lightgreen; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; }
<|file_sep|>example/style.css.diff original: color: green; updated: color: lawngreen; <|file_sep|>original/example/style.css .ng-promise-pending { color: orange; } .ng-promise-resolved { color: green; } .ng-promise-resolved.ng-promise-settled { color: greenyellow; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; } <|file_sep|>current/example/style.css .ng-promise-pending { color: orange; } .ng-promise-resolved { color: lawngreen; } .ng-promise-resolved.ng-promise-settled { color: greenyellow; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; } <|file_sep|>updated/example/style.css .ng-promise-pending { color: orange; } .ng-promise-resolved { color: lawngreen; } .ng-promise-resolved.ng-promise-settled { color: lightgreen; } .ng-promise-rejected { color: red; } .ng-promise-rejected.ng-promise-settled { color: palevioletred; }
dc4818ec85643566c6c6e6994b26ee151473d7a2
example/style.css
example/style.css
CSS
<|file_sep|>original/requirements/dev.txt # This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.0.7 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0 <|file_sep|>current/requirements/dev.txt # This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.0.7 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0 <|file_sep|>updated/requirements/dev.txt
# This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.3.1 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0
<|file_sep|>original/requirements/dev.txt # This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.0.7 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0 <|file_sep|>current/requirements/dev.txt # This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.0.7 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0 <|file_sep|>updated/requirements/dev.txt # This file pulls in everything a developer needs. If it's a basic package # needed to run the site, it belongs in requirements/prod.txt. If it's a # package for developers (testing, docs, etc.), it goes in this file. -r compiled.txt -r prod.txt # Documentation Sphinx>=1.3.1 sphinx_rtd_theme # Testing factory_boy==2.0.2 mock==1.0.1 nose==1.0.0 -e git://github.com/gawel/pyquery.git#egg=pyquery -e git://github.com/jbalogh/django-nose.git#egg=django_nose -e git://github.com/jbalogh/test-utils.git#egg=test-utils # L10n translate-toolkit==1.8.0
a11604701a5f018bbfd6aac7791ce1758798c083
requirements/dev.txt
requirements/dev.txt
Text
<|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: logger.error(error); <|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: <|file_sep|>app/src/plugins/manageErrors.js.diff original: return; updated: } else { ctx.body = 'Unexpected error'; <|file_sep|>app/src/plugins/manageErrors.js.diff original: ctx.body = 'Unexpected error'; updated: <|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: <|file_sep|>original/app/src/plugins/manageErrors.js ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; if (process.env.NODE_ENV !== 'prod') { logger.error(error); } else if (ctx.status === 500) { ctx.body = 'Unexpected error'; return; } ctx.body = { error: error.message, }; } }); } module.exports = { middleware, <|file_sep|>current/app/src/plugins/manageErrors.js if (plugin.config.jsonAPIErrors) { ctx.response.type = 'application/vnd.api+json'; ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; if (process.env.NODE_ENV !== 'prod') { logger.error(error); } else if (ctx.status === 500) { ctx.body = 'Unexpected error'; return; } ctx.body = { error: error.message, }; } }); } <|file_sep|>updated/app/src/plugins/manageErrors.js
if (plugin.config.jsonAPIErrors) { ctx.response.type = 'application/vnd.api+json'; ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; ctx.body = { error: error.message, }; } }); } module.exports = { middleware, init, };
<|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: logger.error(error); <|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: <|file_sep|>app/src/plugins/manageErrors.js.diff original: return; updated: } else { ctx.body = 'Unexpected error'; <|file_sep|>app/src/plugins/manageErrors.js.diff original: ctx.body = 'Unexpected error'; updated: <|file_sep|>app/src/plugins/manageErrors.js.diff original: updated: <|file_sep|>original/app/src/plugins/manageErrors.js ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; if (process.env.NODE_ENV !== 'prod') { logger.error(error); } else if (ctx.status === 500) { ctx.body = 'Unexpected error'; return; } ctx.body = { error: error.message, }; } }); } module.exports = { middleware, <|file_sep|>current/app/src/plugins/manageErrors.js if (plugin.config.jsonAPIErrors) { ctx.response.type = 'application/vnd.api+json'; ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; if (process.env.NODE_ENV !== 'prod') { logger.error(error); } else if (ctx.status === 500) { ctx.body = 'Unexpected error'; return; } ctx.body = { error: error.message, }; } }); } <|file_sep|>updated/app/src/plugins/manageErrors.js if (plugin.config.jsonAPIErrors) { ctx.response.type = 'application/vnd.api+json'; ctx.body = ErrorSerializer.serializeError(ctx.status, error.message); return; } ctx.response.type = 'application/json'; ctx.body = { error: error.message, }; } }); } module.exports = { middleware, init, };
398800a0ba8164aafb6b096487ff91c991b7b024
app/src/plugins/manageErrors.js
app/src/plugins/manageErrors.js
JavaScript