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|>assets/scripts/projects-dropdown.js.diff
original:
$(document).ready(function() {
$(function() {
$('#search-form').on('submit', function() {
var $sel = $('#projects > ul > li.is-selected')
if ($sel.length > 0) {
window.location = $sel.find('a').attr('href')
return false
upd... | })
$('#cerca').on('keydown', function(event) {
if (event.which === 9 && $(this).is(':focus')) {
$(this).blur()
return true
}
})
$('#cerca').on('keyup', function(event) {
var text = event.target.value.toLowerCase()
$('#projects > ul').html($projects.filter(function(index, elem) {
... | <|file_sep|>assets/scripts/projects-dropdown.js.diff
original:
$(document).ready(function() {
$(function() {
$('#search-form').on('submit', function() {
var $sel = $('#projects > ul > li.is-selected')
if ($sel.length > 0) {
window.location = $sel.find('a').attr('href')
return false
upd... | 0056d42df9881df45705a07c96a58f304d7a1d31 | assets/scripts/projects-dropdown.js | assets/scripts/projects-dropdown.js | JavaScript |
<|file_sep|>original/app/controllers/updates_controller.rb
require "velum/salt"
# UpdatesController handles all the interaction with the updates of all nodes.
class UpdatesController < ApplicationController
before_action :admin_needs_update, only: :create
# Reboot the admin node.
def create
::Velum::Salt.ca... | require "velum/salt"
# UpdatesController handles all the interaction with the updates of all nodes.
class UpdatesController < ApplicationController
before_action :admin_needs_update, only: :create
# Reboot the admin node.
def create
# rubocop:disable SkipsModelValidations
Minion.admin.update_all highsta... | <|file_sep|>original/app/controllers/updates_controller.rb
require "velum/salt"
# UpdatesController handles all the interaction with the updates of all nodes.
class UpdatesController < ApplicationController
before_action :admin_needs_update, only: :create
# Reboot the admin node.
def create
::Velum::Salt.ca... | 95ecd9e3e7f72ab32aa7c7bdaece886e4163c80c | app/controllers/updates_controller.rb | app/controllers/updates_controller.rb | Ruby |
<|file_sep|>original/src/condor_includes/condor_constants.h
#define const
#endif
/*
Set up a boolean variable type. Since this definition could conflict
with other reasonable definition of BOOLEAN, i.e. using an enumeration,
it is conditional.
*/
#ifndef BOOLEAN_TYPE_DEFINED
typedef int BOOLEAN;
#endif
#if define... | #define const
#endif
/*
Set up a boolean variable type. Since this definition could conflict
with other reasonable definition of BOOLEAN, i.e. using an enumeration,
it is conditional.
*/
#ifndef BOOLEAN_TYPE_DEFINED
typedef int BOOLEAN;
typedef int BOOL;
#endif
#if defined(TRUE)
# undef TRUE
# undef FALSE
#endif
... | <|file_sep|>original/src/condor_includes/condor_constants.h
#define const
#endif
/*
Set up a boolean variable type. Since this definition could conflict
with other reasonable definition of BOOLEAN, i.e. using an enumeration,
it is conditional.
*/
#ifndef BOOLEAN_TYPE_DEFINED
typedef int BOOLEAN;
#endif
#if define... | b8f325d491a751bb8478b36f85493c728b5d098e | src/condor_includes/condor_constants.h | src/condor_includes/condor_constants.h | C |
<|file_sep|>original/ansible/roles/xroad-gateway/templates/consumers.properties
0.id=FI.GOV.1945065-0.VAAKKO1.ListMembers.v1
0.path=/ListMembers/
0.verb=get
0.namespace.deserialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.serialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.prefix.serialize=xrcl
<... | 0.id=FI.GOV.1945065-0.VAAKKO1.ListMembers.v1
0.path=/ListMembers/
0.verb=get
0.namespace.deserialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.serialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.prefix.serialize=xrcl
1.id=FI.GOV.1945065-0.VAAKKO1.GetWsdl.v1
1.path=/GetWsdl/
1.verb=get
1.namespace.... | <|file_sep|>original/ansible/roles/xroad-gateway/templates/consumers.properties
0.id=FI.GOV.1945065-0.VAAKKO1.ListMembers.v1
0.path=/ListMembers/
0.verb=get
0.namespace.deserialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.serialize=http://xroad.vrk.fi/xroad-catalog-lister
0.namespace.prefix.serialize=xrcl
<... | 0604450103f33d81b1687805d57fd91e30758c56 | ansible/roles/xroad-gateway/templates/consumers.properties | ansible/roles/xroad-gateway/templates/consumers.properties | INI |
<|file_sep|>mediachain/reader/main.py.diff
original:
from mediachain.reader.api import Config
updated:
<|file_sep|>original/mediachain/reader/main.py
subparsers = parser.add_subparsers(help='Mediachain Reader SubCommands',
dest='subcommand')
get_parser = subparsers.add_p... | subparsers = parser.add_subparsers(help='Mediachain Reader SubCommands',
dest='subcommand')
get_parser = subparsers.add_parser(
'get',
help='Get a revision chain for a given artefact/entity id'
)
get_parser.add_argument('object_id',
... | <|file_sep|>mediachain/reader/main.py.diff
original:
from mediachain.reader.api import Config
updated:
<|file_sep|>original/mediachain/reader/main.py
subparsers = parser.add_subparsers(help='Mediachain Reader SubCommands',
dest='subcommand')
get_parser = subparsers.add_p... | ec85333da83e1c7de16dd7a5a3551dc9a1f660b4 | mediachain/reader/main.py | mediachain/reader/main.py | Python |
<|file_sep|>original/app/models/user.rb
@password ||= Password.new(password_digest)
end
def password=(new_password)
@password = Password.create(new_password)
self.password_digest = @password
end
def self.authenticate(username, password)
user = User.find_by(username: username)
if user && us... | @password ||= Password.new(password_digest)
end
def password=(new_password)
@password = Password.create(new_password)
self.password_digest = @password
end
def self.authenticate(username, password)
user = User.find_by(username: username)
if user && user.password == password
user
e... | <|file_sep|>original/app/models/user.rb
@password ||= Password.new(password_digest)
end
def password=(new_password)
@password = Password.create(new_password)
self.password_digest = @password
end
def self.authenticate(username, password)
user = User.find_by(username: username)
if user && us... | cdc93b4c0eb1592b31ca6ccec2a1f7048b9aa297 | app/models/user.rb | app/models/user.rb | Ruby |
<|file_sep|>.travis.yml.diff
original:
updated:
- sudo apt-get update -qq
- sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install docker-engine
<|file_sep|>original/.travis.yml
- docker pull mysql:5.5.43
- docker pull mysql:5.6
- docker pull mysql:5.5
- docker pull p... | - docker pull alpine:3.2
- docker pull mysql:latest
- docker pull mysql:5.5.43
- docker pull mysql:5.6
- docker pull mysql:5.5
- docker pull postgres:latest
- docker pull selenium/standalone-chrome-debug:2.45.0
- docker pull selenium/standalone-firefox-debug:2.45.0
- docker pull richnorth/vnc-recorder... | <|file_sep|>.travis.yml.diff
original:
updated:
- sudo apt-get update -qq
- sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install docker-engine
<|file_sep|>original/.travis.yml
- docker pull mysql:5.5.43
- docker pull mysql:5.6
- docker pull mysql:5.5
- docker pull p... | cee35d6a9676e506bd500531000618c895294a82 | .travis.yml | .travis.yml | YAML |
<|file_sep|>original/models.py
from django.db import models
# Create your models here.
class User(models.Model):
display_name = models.CharField(max_length=64)
auth_key = models.CharField(max_length=64)
class Post(models.Model):
user = models.ForeignKey(User)
text = models.CharField(max_length=4000)
class Comme... | from django.db import models
# Create your models here.
class User(models.Model):
display_name = models.CharField(max_length=64)
auth_key = models.CharField(max_length=64)
class Post(models.Model):
user = models.ForeignKey(User)
text = models.CharField(max_length=4000)
last_modified = models.DateTimeField()
cl... | <|file_sep|>original/models.py
from django.db import models
# Create your models here.
class User(models.Model):
display_name = models.CharField(max_length=64)
auth_key = models.CharField(max_length=64)
class Post(models.Model):
user = models.ForeignKey(User)
text = models.CharField(max_length=4000)
class Comme... | fc74e6a4bc9992647abbb9f92a7e5880e5c29506 | models.py | models.py | Python |
<|file_sep|>dev-resources/incise.edn.diff
original:
{:parse-defaults {:layout :vm}
updated:
{:site-title "manners"
:author "Ryan McGowan"
:parse-defaults {:layout :vm}
<|file_sep|>original/dev-resources/incise.edn
{:parse-defaults {:layout :vm}
:stefon {:asset-roots ["dev-resources/assets"]
:manifest-file ... | {:site-title "manners"
:author "Ryan McGowan"
:parse-defaults {:layout :vm}
:stefon {:asset-roots ["dev-resources/assets"]
:manifest-file "dev-resources/manifest.json"
:precompiles ["vm/javascripts/vm.js.stefon"
"vm/stylesheets/vm.css.stefon"]}
:uri-root "manners"
:deplo... | <|file_sep|>dev-resources/incise.edn.diff
original:
{:parse-defaults {:layout :vm}
updated:
{:site-title "manners"
:author "Ryan McGowan"
:parse-defaults {:layout :vm}
<|file_sep|>original/dev-resources/incise.edn
{:parse-defaults {:layout :vm}
:stefon {:asset-roots ["dev-resources/assets"]
:manifest-file ... | dcb6f41ce2e7f03fb1e3047884115fc2ce164ad5 | dev-resources/incise.edn | dev-resources/incise.edn | edn |
<|file_sep|>Wikipedia/Code/TalkPageFetcher.swift.diff
original:
init(items: [TalkPageItem]) {
self.threadItems = items
}
updated:
<|file_sep|>Wikipedia/Code/TalkPageFetcher.swift.diff
original:
func fetchTalkPageContent(url: URL, completion: @escaping (Result<TalkPageAPIResponse?, Error>) -> V... | }
let params = ["action" : "discussiontoolspageinfo",
"page" : pageTitle,
"format": "json",
"prop" : "threaditemshtml",
"fomatversion" : "2"
]
performDecodableMediaWikiAPIGET(for: url, with:... | <|file_sep|>Wikipedia/Code/TalkPageFetcher.swift.diff
original:
init(items: [TalkPageItem]) {
self.threadItems = items
}
updated:
<|file_sep|>Wikipedia/Code/TalkPageFetcher.swift.diff
original:
func fetchTalkPageContent(url: URL, completion: @escaping (Result<TalkPageAPIResponse?, Error>) -> V... | 7404251c01fc52e98595b5d4c0dc69fca935642f | Wikipedia/Code/TalkPageFetcher.swift | Wikipedia/Code/TalkPageFetcher.swift | Swift |
<|file_sep|>original/TestScript/multi_client.py
<|file_sep|>current/TestScript/multi_client.py
<|file_sep|>updated/TestScript/multi_client.py | # -*- coding: utf-8 -*-
__author__ = 'sm9'
import asyncore, socket
import string, random
import struct, time
HOST = '192.168.0.11'
PORT = 9001
PKT_CS_LOGIN = 1
PKT_SC_LOGIN = 2
PKT_CS_CHAT = 3
PKT_SC_CHAT = 4
def str_generator(size=128, chars=string.ascii_uppercase + string.digits):
return ''.join(random.ch... | <|file_sep|>original/TestScript/multi_client.py
<|file_sep|>current/TestScript/multi_client.py
<|file_sep|>updated/TestScript/multi_client.py
# -*- coding: utf-8 -*-
__author__ = 'sm9'
import asyncore, socket
import string, random
import struct, time
HOST = '192.168.0.11'
PORT = 9001
PKT_CS_LOGIN = 1
PKT_SC_LOGIN... | 1663cb8557de85b1f3ccf5822fa01758e679ccd7 | TestScript/multi_client.py | TestScript/multi_client.py | Python |
<|file_sep|>.gitlab-ci.yml.diff
original:
updated:
variables:
LC_ALL: "C"
<|file_sep|>original/.gitlab-ci.yml
key: "$CI_COMMIT_REF_NAME"
untracked: true
test:
image: cmeter/clojure-phantomjs
stage: test
script:
- LC_ALL=C lein phantomtest
linting:
stage: test
script:
- lein do ancient, kibit... | key: "$CI_COMMIT_REF_NAME"
untracked: true
variables:
LC_ALL: "C"
test:
image: cmeter/clojure-phantomjs
stage: test
script:
- lein phantomtest
linting:
stage: test
script:
- lein do ancient, kibit
allow_failure: true
build_image:
image: docker:git
stage: deploy | <|file_sep|>.gitlab-ci.yml.diff
original:
updated:
variables:
LC_ALL: "C"
<|file_sep|>original/.gitlab-ci.yml
key: "$CI_COMMIT_REF_NAME"
untracked: true
test:
image: cmeter/clojure-phantomjs
stage: test
script:
- LC_ALL=C lein phantomtest
linting:
stage: test
script:
- lein do ancient, kibit... | 68a16aba6366dd9e7810a76bf0ee9a892dee1656 | .gitlab-ci.yml | .gitlab-ci.yml | YAML |
<|file_sep|>src/services/school/hooks/lookupSchool.js.diff
original:
const { BadRequest } = require('@feathersjs/errors');
updated:
const { BadRequest, NotFound } = require('@feathersjs/errors');
<|file_sep|>original/src/services/school/hooks/lookupSchool.js
const { BadRequest } = require('@feathersjs/errors');
const {... | * Add school object referenced in route to params
*
* @example `/schools/23bd1/subRoute` => params: { school: { _id: 23bd1, name: 'Testschule', ... } }
*/
module.exports = async (context) => {
if (!context.params || !context.params.route) {
throw new BadRequest('Missing request params');
}
const { schoolId } =... | <|file_sep|>src/services/school/hooks/lookupSchool.js.diff
original:
const { BadRequest } = require('@feathersjs/errors');
updated:
const { BadRequest, NotFound } = require('@feathersjs/errors');
<|file_sep|>original/src/services/school/hooks/lookupSchool.js
const { BadRequest } = require('@feathersjs/errors');
const {... | 76f5eae70271d5543a8a7d89212e6aeb87b37799 | src/services/school/hooks/lookupSchool.js | src/services/school/hooks/lookupSchool.js | JavaScript |
<|file_sep|>original/hiera/hosts/prod-web7.cashmusic.org.yaml
# Settings specific to host prod-web7.cashmusic.org.
# Override default production environment label for bobo server.
site_profile::web::deployment_environment: production-bobo
# prod-web7 runs bobo, not the CASH Music platform, so override the default vho... | # Settings specific to host prod-web7.cashmusic.org.
# Override default production environment label for bobo server.
site_profile::web::deployment_environment: production-bobo
# prod-web7 runs bobo, not the CASH Music platform, so override the default vhost.
site_profile::web::vhosts:
platform_default:
default... | <|file_sep|>original/hiera/hosts/prod-web7.cashmusic.org.yaml
# Settings specific to host prod-web7.cashmusic.org.
# Override default production environment label for bobo server.
site_profile::web::deployment_environment: production-bobo
# prod-web7 runs bobo, not the CASH Music platform, so override the default vho... | e30f4f0705a325b4644eaa02e9bd9212133cb44e | hiera/hosts/prod-web7.cashmusic.org.yaml | hiera/hosts/prod-web7.cashmusic.org.yaml | YAML |
<|file_sep|>spec/spec_helper.rb.diff
original:
updated:
<|file_sep|>original/spec/spec_helper.rb
SimpleCov.start do
add_filter 'spec/dummy'
end
# Configure Rails Environment
ENV["RAILS_ENV"] = "test"
require File.expand_path("../../spec/dummy/config/environment.rb", __FILE__)
ActiveRecord::Migrator.migrations_pat... | add_filter 'spec/dummy'
end
# Configure Rails Environment
ENV["RAILS_ENV"] = "test"
require File.expand_path("../../spec/dummy/config/environment.rb", __FILE__)
ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../spec/dummy/db/migrate", __FILE__)]
# require "rails/test_help"
if defined?(ActiveRecord... | <|file_sep|>spec/spec_helper.rb.diff
original:
updated:
<|file_sep|>original/spec/spec_helper.rb
SimpleCov.start do
add_filter 'spec/dummy'
end
# Configure Rails Environment
ENV["RAILS_ENV"] = "test"
require File.expand_path("../../spec/dummy/config/environment.rb", __FILE__)
ActiveRecord::Migrator.migrations_pat... | 7ac7905601adcdf8ae0fbd7ccd57d72bdaf313d2 | spec/spec_helper.rb | spec/spec_helper.rb | Ruby |
<|file_sep|>caminae/core/templates/core/fieldmap_fragment.html.diff
original:
function {{ mapname }}Init(map) {
updated:
function {{ mapname }}Init(map, bounds) {
<|file_sep|>caminae/core/templates/core/fieldmap_fragment.html.diff
original:
map.fitBounds(new L.LatLngBounds({{ object|latlngbounds }}));
updated:
... | map.removeControl(map.attributionControl);
// Add layers
var geojson = {{ object|geojsonfeature|safe }};
var objectLayer = new Caminae.ObjectsLayer(geojson, {
style: {weight: 5, opacity: 1, clickable: false}
});
map.addLayer(objectLayer);
var objectBounds = {{ object|latlngbound... | <|file_sep|>caminae/core/templates/core/fieldmap_fragment.html.diff
original:
function {{ mapname }}Init(map) {
updated:
function {{ mapname }}Init(map, bounds) {
<|file_sep|>caminae/core/templates/core/fieldmap_fragment.html.diff
original:
map.fitBounds(new L.LatLngBounds({{ object|latlngbounds }}));
updated:
... | a6b2cd3af68ea739e0b7db3a61d02abf20a02feb | caminae/core/templates/core/fieldmap_fragment.html | caminae/core/templates/core/fieldmap_fragment.html | HTML |
<|file_sep|>lib/loudmouth.rb.diff
original:
updated:
require "extensions/active_record"
<|file_sep|>lib/loudmouth.rb.diff
original:
ActiveSupport.on_load(:action_controller) do
updated:
# ActiveSupport.on_load(:action_controller) do
# include Loudmouth::Controllers::Helpers
# end
ActiveSupport.o... |
mattr_accessor :new_comment_content
@@new_comment_content = ''
mattr_accessor :treasure_map
@@treasure_map = {}
def self.setup
yield self
end
def self.include_helpers
# ActiveSupport.on_load(:action_controller) do
# include Loudmouth::Controllers::Helpers
# end
ActiveSupport... | <|file_sep|>lib/loudmouth.rb.diff
original:
updated:
require "extensions/active_record"
<|file_sep|>lib/loudmouth.rb.diff
original:
ActiveSupport.on_load(:action_controller) do
updated:
# ActiveSupport.on_load(:action_controller) do
# include Loudmouth::Controllers::Helpers
# end
ActiveSupport.o... | 4486e02f940ccf14b6fb0206c252c7aff74d1a90 | lib/loudmouth.rb | lib/loudmouth.rb | Ruby |
<|file_sep|>original/.travis.yml
language: java
jdk: openjdk8
dist: trusty
script:
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -q -B -V
- ./mvnw test -q -B -V
cache:
directories:
- $HOME/.m2
<|file_sep|>current/.travis.yml
language: java
jdk: openjdk8
dist: trusty
script:
- ./mvnw install -D... | language: java
jdk: openjdk8
dist: trusty
cache:
directories:
- $HOME/.m2 | <|file_sep|>original/.travis.yml
language: java
jdk: openjdk8
dist: trusty
script:
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -q -B -V
- ./mvnw test -q -B -V
cache:
directories:
- $HOME/.m2
<|file_sep|>current/.travis.yml
language: java
jdk: openjdk8
dist: trusty
script:
- ./mvnw install -D... | 3d2ece1138ee1b3fa9c00ba6a952263752e69880 | .travis.yml | .travis.yml | YAML |
<|file_sep|>.travis.yml.diff
original:
updated:
- sbt --info ++$TRAVIS_SCALA_VERSION -DplayTestVersion=2.6.1 +test
<|file_sep|>original/.travis.yml
language: scala
jdk:
- oraclejdk8
scala:
- 2.11.11
script:
- cd code
- sbt --info ++$TRAVIS_SCALA_VERSION +publishLocal
- cd ../test-app
- sbt --info ++$TRAVIS_SCALA_VERSI... | language: scala
jdk:
- oraclejdk8
scala:
- 2.11.11
script:
- cd code
- sbt --info ++$TRAVIS_SCALA_VERSION +publishLocal
- cd ../test-app
- sbt --info ++$TRAVIS_SCALA_VERSION -DplayTestVersion=2.6.0 +test
- sbt --info ++$TRAVIS_SCALA_VERSION -DplayTestVersion=2.6.1 +test
- cd ../test-app-filters
- sbt --info ++$TRAVIS_S... | <|file_sep|>.travis.yml.diff
original:
updated:
- sbt --info ++$TRAVIS_SCALA_VERSION -DplayTestVersion=2.6.1 +test
<|file_sep|>original/.travis.yml
language: scala
jdk:
- oraclejdk8
scala:
- 2.11.11
script:
- cd code
- sbt --info ++$TRAVIS_SCALA_VERSION +publishLocal
- cd ../test-app
- sbt --info ++$TRAVIS_SCALA_VERSI... | ff8e1a64eaaa66464eb7f2af34019d008c453868 | .travis.yml | .travis.yml | YAML |
<|file_sep|>original/ReleaseProcess.md
<|file_sep|>current/ReleaseProcess.md
<|file_sep|>updated/ReleaseProcess.md | # Release process (DRAFT)
## Objectives
As identified in [issue 76](https://github.com/tawan/active-elastic-job/issues/76) releases came to a halt which raised the question if the project has been abandoned.
At that time, a new version was tested with a suite of integration test prior release.
The single maintainer w... | <|file_sep|>original/ReleaseProcess.md
<|file_sep|>current/ReleaseProcess.md
<|file_sep|>updated/ReleaseProcess.md
# Release process (DRAFT)
## Objectives
As identified in [issue 76](https://github.com/tawan/active-elastic-job/issues/76) releases came to a halt which raised the question if the project has been aban... | ec51c5d9dedc4a1b47f2db41f26d5fceb251e979 | ReleaseProcess.md | ReleaseProcess.md | Markdown |
<|file_sep|>original/.github/workflows/scheduled-builds.yml
post-01,
post-02,
post-03,
post-04,
post-05,
post-06,
post-07,
post-08,
post-09,
post-10,
post-11,
post-12,
]
runs-on: ubuntu-la... | post-01,
post-02,
post-03,
post-04,
post-05,
post-06,
post-07,
post-08,
post-09,
post-10,
post-11,
post-12,
]
runs-on: ubuntu-latest
steps:
- name: Invoke workflow
uses: ... | <|file_sep|>original/.github/workflows/scheduled-builds.yml
post-01,
post-02,
post-03,
post-04,
post-05,
post-06,
post-07,
post-08,
post-09,
post-10,
post-11,
post-12,
]
runs-on: ubuntu-la... | a9df1f2ec2e6c0caf52ba36a3d12ded196e306a8 | .github/workflows/scheduled-builds.yml | .github/workflows/scheduled-builds.yml | YAML |
<|file_sep|>original/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md
<|file_sep|>current/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md
<|file_sep|>updated/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md | ---
layout: post
author:
- ShyArmadillo8
- wookiemage
title: "Colin Nickel's and Jasmine Plott's Chapter 8 Pair Programming Exercises"
---
Here is the 8.4 exercise:
<iframe src="https://trinket.io/embed/python/448c8c4f8a" width="100%" height="600" frameborder="0" marginwidth="0" marginheight="0" allowfullscreen></ifra... | <|file_sep|>original/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md
<|file_sep|>current/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md
<|file_sep|>updated/_posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md
---
layout: post
... | 05bfa8f8ffb088eb7a52da0da922687f61e64756 | _posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md | _posts/ShyArmadillo8/2016-02-09-ColinNickelsAndJasminePlottChapter8Exercises.md | Markdown |
<|file_sep|>original/package.json
},
"keywords": [
"broccoli-plugin",
"coffeescript",
"javascript"
],
"scripts": {
"test": "mocha"
},
"dependencies": {
"broccoli-persistent-filter": "^1.1.5",
"coffee-script": "^1.11.1",
"json-stable-stringify": "^1.0.0"
},
"devDependencies": ... | },
"keywords": [
"broccoli-plugin",
"coffeescript",
"javascript"
],
"scripts": {
"test": "mocha"
},
"dependencies": {
"broccoli-persistent-filter": "^1.1.5",
"coffee-script": "~1.11.1",
"json-stable-stringify": "^1.0.0"
},
"devDependencies": {
"broccoli-fixture": "^0.1.0"... | <|file_sep|>original/package.json
},
"keywords": [
"broccoli-plugin",
"coffeescript",
"javascript"
],
"scripts": {
"test": "mocha"
},
"dependencies": {
"broccoli-persistent-filter": "^1.1.5",
"coffee-script": "^1.11.1",
"json-stable-stringify": "^1.0.0"
},
"devDependencies": ... | 002381ed10704aa4df85bff8e8e1dab6157713b4 | package.json | package.json | JSON |
<|file_sep|>original/lib/helpers/string_formatter.rb
truncated = true
end
end
new_string.strip!
new_string << "..." if truncated
new_string
end
def pluralize(count, plural)
if (count == 1)
self
else
plural
end
end
end
class String
include StringFormatter
... | new_string.strip!
new_string << "..." if truncated
new_string
end
def pluralize(count, plural)
if (count == 1)
self
else
plural
end
end
def link_to(url)
"<a href=\"#{url}\" target=\"_blank\">#{self}</a>"
end
end
class String
include StringFormatter
end | <|file_sep|>original/lib/helpers/string_formatter.rb
truncated = true
end
end
new_string.strip!
new_string << "..." if truncated
new_string
end
def pluralize(count, plural)
if (count == 1)
self
else
plural
end
end
end
class String
include StringFormatter
... | ad60adc3ec36f24788d674be169db5af6401e39d | lib/helpers/string_formatter.rb | lib/helpers/string_formatter.rb | Ruby |
<|file_sep|>main.go.diff
original:
"os"
"io/ioutil"
"github.com/hashicorp/hcl/json/parser"
"github.com/hashicorp/hcl/hcl/printer"
updated:
"fmt"
"io/ioutil"
"os"
"github.com/hashicorp/hcl/hcl/printer"
"github.com/hashicorp/hcl/json/parser"
<|file_sep|>main.go.diff
original:
input, _ := ioutil.ReadAll(os... | }
}
func convert() error {
input, err := ioutil.ReadAll(os.Stdin)
if err != nil {
return fmt.Errorf("unable to read from stdin: %s", err)
}
ast, err := parser.Parse([]byte(input))
if err != nil {
return fmt.Errorf("unable to parse JSON: %s", err)
}
err = printer.Fprint(os.Stdout, ast)
if err != nil {
... | <|file_sep|>main.go.diff
original:
"os"
"io/ioutil"
"github.com/hashicorp/hcl/json/parser"
"github.com/hashicorp/hcl/hcl/printer"
updated:
"fmt"
"io/ioutil"
"os"
"github.com/hashicorp/hcl/hcl/printer"
"github.com/hashicorp/hcl/json/parser"
<|file_sep|>main.go.diff
original:
input, _ := ioutil.ReadAll(os... | 026d0d2b73b4fde694c4e4430c70dc905078b921 | main.go | main.go | Go |
<|file_sep|>original/README.md
<p align="center">
<img alt="Redactor Logo" src="https://testthedocs.org/img/redactor-logo.png" height="140" />
<h3 align="center">REDACTOR</h3>
</p>
---
[](https://gitter.im/testthedocs/Lobby)
A work in progress editor-in... | <p align="center">
<img alt="Redactor Logo" src="https://testthedocs.org/img/redactor-logo.png" height="140" />
<h3 align="center">REDACTOR</h3>
</p>
---
[](https://gitter.im/testthedocs/Lobby)
A work in progress editor-in-chief to highlight potential l... | <|file_sep|>original/README.md
<p align="center">
<img alt="Redactor Logo" src="https://testthedocs.org/img/redactor-logo.png" height="140" />
<h3 align="center">REDACTOR</h3>
</p>
---
[](https://gitter.im/testthedocs/Lobby)
A work in progress editor-in... | 10efd8d8d3ccea5fd4a92485079ffa116bf8bfad | README.md | README.md | Markdown |
<|file_sep|>booksforcha/booksforcha.py.diff
original:
updated:
schedule.every(LOAD_FEED_SECONDS).seconds.do(
load_feed, parse_feed_list(RSS_FEED_LIST))
schedule.every(SEND_QUEUED_TWEET_SECONDS).seconds.do(send_queued_tweet)
<|file_sep|>original/booksforcha/booksforcha.py
else:
return parsed
def main... | else:
return parsed
schedule.every(LOAD_FEED_SECONDS).seconds.do(
load_feed, parse_feed_list(RSS_FEED_LIST))
schedule.every(SEND_QUEUED_TWEET_SECONDS).seconds.do(send_queued_tweet)
def main():
while True:
schedule.run_pending()
time.sleep(1)
def __main__():
main()
if __nam... | <|file_sep|>booksforcha/booksforcha.py.diff
original:
updated:
schedule.every(LOAD_FEED_SECONDS).seconds.do(
load_feed, parse_feed_list(RSS_FEED_LIST))
schedule.every(SEND_QUEUED_TWEET_SECONDS).seconds.do(send_queued_tweet)
<|file_sep|>original/booksforcha/booksforcha.py
else:
return parsed
def main... | aac11d0d9805559000635b24227a8d13314feaa1 | booksforcha/booksforcha.py | booksforcha/booksforcha.py | Python |
<|file_sep|>original/A_Setup_and_install.md
<|file_sep|>current/A_Setup_and_install.md
<|file_sep|>updated/A_Setup_and_install.md | # Install and setup the required software your machine
This document describes the necessary steps to make your machine ready for using Python and connecting to the B2SHARE service.
## Prerequisites
You need a machine equipped with an internet connection and a recent version of the Python software package (version >= ... | <|file_sep|>original/A_Setup_and_install.md
<|file_sep|>current/A_Setup_and_install.md
<|file_sep|>updated/A_Setup_and_install.md
# Install and setup the required software your machine
This document describes the necessary steps to make your machine ready for using Python and connecting to the B2SHARE service.
## Pr... | 075659981e4c37ec4bc7b3ea5ddc06b370b9ab12 | A_Setup_and_install.md | A_Setup_and_install.md | Markdown |
<|file_sep|>root/scripts/Interface.js.diff
original:
* componentDidMount
*/
// componentDidMount: function() {
// if (this.props.friendo) {
// this.setState({
// friendo: this.props.friendo,
// });
// }
// },
/**
updated:
<|file_sep|>root/scripts/Inte... | }
},
/**
* Render the component
*/
render: function() {
return(
<div className='interface'>
<Authenticate ref='authenticated' update={this.authenticate} />
<h3>Client ID: {this.state.email}</h3>
</div>
);
}
});
i... | <|file_sep|>root/scripts/Interface.js.diff
original:
* componentDidMount
*/
// componentDidMount: function() {
// if (this.props.friendo) {
// this.setState({
// friendo: this.props.friendo,
// });
// }
// },
/**
updated:
<|file_sep|>root/scripts/Inte... | 7e66ec5491d669876f10d55061496c5553b9d7bb | root/scripts/Interface.js | root/scripts/Interface.js | JavaScript |
<|file_sep|>original/lib/active_admin/view_helpers/auto_link_helper.rb
#
# The default content in the link is returned from ActiveAdmin::ViewHelpers::DisplayHelper#display_name
#
# You can pass in the content to display
# eg: auto_link(@post, "My Link Content")
#
def auto_lin... | #
# The default content in the link is returned from ActiveAdmin::ViewHelpers::DisplayHelper#display_name
#
# You can pass in the content to display
# eg: auto_link(@post, "My Link Content")
#
def auto_link(resource, link_content = nil)
content = link_content || displ... | <|file_sep|>original/lib/active_admin/view_helpers/auto_link_helper.rb
#
# The default content in the link is returned from ActiveAdmin::ViewHelpers::DisplayHelper#display_name
#
# You can pass in the content to display
# eg: auto_link(@post, "My Link Content")
#
def auto_lin... | f98cb4c370b26d9f81a0b8d2dd3762288c631054 | lib/active_admin/view_helpers/auto_link_helper.rb | lib/active_admin/view_helpers/auto_link_helper.rb | Ruby |
<|file_sep|>original/.travis.yml
language: rust
env:
global:
- secure: M3MQctEuODcx9sdnjkiJio+tMw1bbp+ldwZXgZDh5K36+oPxJdAK1lSXLWIBp+c/+JMmhNbYcpJejCMJLgyPoLn7pUHOU2kj8hVDvf7IPdQ5DmH5KltHt1ZFIl4yF6QB77fq93RCn+WHoIIJxB1WaMvn8T1Sa8H6F/UCLSIszQE=
script:
- cargo build --verbose
- cargo test --verbose
after_scrip... | language: rust
rust:
- nightly
- 1.0.0-beta
env:
global:
- secure: M3MQctEuODcx9sdnjkiJio+tMw1bbp+ldwZXgZDh5K36+oPxJdAK1lSXLWIBp+c/+JMmhNbYcpJejCMJLgyPoLn7pUHOU2kj8hVDvf7IPdQ5DmH5KltHt1ZFIl4yF6QB77fq93RCn+WHoIIJxB1WaMvn8T1Sa8H6F/UCLSIszQE=
script:
- cargo build --verbose
- cargo test --verbose
after_scrip... | <|file_sep|>original/.travis.yml
language: rust
env:
global:
- secure: M3MQctEuODcx9sdnjkiJio+tMw1bbp+ldwZXgZDh5K36+oPxJdAK1lSXLWIBp+c/+JMmhNbYcpJejCMJLgyPoLn7pUHOU2kj8hVDvf7IPdQ5DmH5KltHt1ZFIl4yF6QB77fq93RCn+WHoIIJxB1WaMvn8T1Sa8H6F/UCLSIszQE=
script:
- cargo build --verbose
- cargo test --verbose
after_scrip... | 27e537768dc3a2c218503a3f6d70b97280c76b6b | .travis.yml | .travis.yml | YAML |
<|file_sep|>original/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java
<|file_sep|>current/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java
<|file_sep|>updated/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOs... | /*
* (C) Copyright 2018 Boni Garcia (http://bonigarcia.github.io/)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless require... | <|file_sep|>original/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java
<|file_sep|>current/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java
<|file_sep|>updated/junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOs... | 18a0d96633f79e90d4b5204a7691e7245b876940 | junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java | junit5-conditional-tests/src/test/java/io/github/bonigarcia/BuiltinDisabledOnOsTest.java | Java |
<|file_sep|>original/.travis.yaml
language: python
python:
- "2.7"
- "2.6"
# command to install dependencies
install:
- "pip install requirements/external_apps.txt"
- "pip install requirements/test_apps.txt"
# command to run tests
script: "python pages/test_runner.py"
<|file_sep|>current/.travis.yaml
language: ... | language: python
python:
- "2.7"
# command to install dependencies
install:
- "pip install requirements/external_apps.txt"
- "pip install requirements/test_apps.txt"
# command to run tests
script: "python pages/test_runner.py" | <|file_sep|>original/.travis.yaml
language: python
python:
- "2.7"
- "2.6"
# command to install dependencies
install:
- "pip install requirements/external_apps.txt"
- "pip install requirements/test_apps.txt"
# command to run tests
script: "python pages/test_runner.py"
<|file_sep|>current/.travis.yaml
language: ... | b83138d7ca213f96b86805fb8eb6ee7a5768ffa7 | .travis.yaml | .travis.yaml | YAML |
<|file_sep|>theater-app/app/scripts/controllers/mediaerrorspublisher.js.diff
original:
var ReportModalInstanceCtrl = ['$scope','$modalInstance', 'error', function($scope, $modalInstance, error){
updated:
var ReportModalInstanceCtrl = ['$scope', '$rootScope','$modalInstance', 'error', 'MediaError', function($sco... | 'Incorrect language',
'Captions do not show up',
'Captions are not in correct language',
'Captions are not properly synced'
];
$scope.error = error;
$scope.ok = function(){
$scope.error.$save(function(report){
if(report){
$modalInstance.clo... | <|file_sep|>theater-app/app/scripts/controllers/mediaerrorspublisher.js.diff
original:
var ReportModalInstanceCtrl = ['$scope','$modalInstance', 'error', function($scope, $modalInstance, error){
updated:
var ReportModalInstanceCtrl = ['$scope', '$rootScope','$modalInstance', 'error', 'MediaError', function($sco... | 8bd2d177c51ad748ed51f6139f6b3b2e8a5f7def | theater-app/app/scripts/controllers/mediaerrorspublisher.js | theater-app/app/scripts/controllers/mediaerrorspublisher.js | JavaScript |
<|file_sep|>original/app/Mail/Attendance/Report.php
*/
public function __construct(AttendanceExport $export)
{
$this->export = $export;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this
->from('attendancer... | */
public function __construct(AttendanceExport $export)
{
$this->export = $export;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this
->from('attendancereports@my.robojackets.org', 'RoboJackets')
... | <|file_sep|>original/app/Mail/Attendance/Report.php
*/
public function __construct(AttendanceExport $export)
{
$this->export = $export;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this
->from('attendancer... | 6eecd40d8bb86eade8c8a5167f6ad8da5d7c7bde | app/Mail/Attendance/Report.php | app/Mail/Attendance/Report.php | PHP |
<|file_sep|>composer.json.diff
original:
"psr-0": { "": "src/", "SymfonyStandard": "app/" }
updated:
"psr-4": {
"": "src/",
"SymfonyStandard\\": "app/",
"HCLabs\\Bills\\": "src/HCLabs/Bills/src/",
"HCLabs\\Bills\\Tests\\": "src/HCLabs/Bills/tests/"
... | "HCLabs\\Bills\\": "src/HCLabs/Bills/src/",
"HCLabs\\Bills\\Tests\\": "src/HCLabs/Bills/tests/"
}
},
"require": {
"php": ">=5.3.3",
"symfony/symfony": "2.5.*",
"doctrine/orm": "~2.2,>=2.2.3",
"doctrine/doctrine-bundle": "~1.3-dev",
"twig/ex... | <|file_sep|>composer.json.diff
original:
"psr-0": { "": "src/", "SymfonyStandard": "app/" }
updated:
"psr-4": {
"": "src/",
"SymfonyStandard\\": "app/",
"HCLabs\\Bills\\": "src/HCLabs/Bills/src/",
"HCLabs\\Bills\\Tests\\": "src/HCLabs/Bills/tests/"
... | dbea06d755bb6af01db5a2f4f85fb3b960fba1a7 | composer.json | composer.json | JSON |
<|file_sep|>original/requirements/local.txt
# Local development dependencies go here
-r base.txt
-r test.txt
# Documentation
sphinx==1.5.5
sphinx-rtd-theme==0.2.4
# Debugging Tools
django-debug-toolbar==1.8
django-extensions==1.7.8
<|file_sep|>current/requirements/local.txt
# Local development dependencies go here
-r... | # Local development dependencies go here
-r base.txt
-r test.txt
# Documentation
sphinx==1.5.5
sphinx-rtd-theme==0.2.4
# Debugging Tools
django-debug-toolbar==1.8
django-extensions==1.7.9 | <|file_sep|>original/requirements/local.txt
# Local development dependencies go here
-r base.txt
-r test.txt
# Documentation
sphinx==1.5.5
sphinx-rtd-theme==0.2.4
# Debugging Tools
django-debug-toolbar==1.8
django-extensions==1.7.8
<|file_sep|>current/requirements/local.txt
# Local development dependencies go here
-r... | 4723d7c7acd1add4aa082e6637742630d7da6d84 | requirements/local.txt | requirements/local.txt | Text |
<|file_sep|>original/test/client/runner.html
<!-- Test framework libraries. -->
<script src="../../bower_components/mocha/mocha.js"></script>
<script src="../../bower_components/chai/chai.js"></script>
<script src="../../bower_components/chai-as-promised/lib/chai-as-promised.js"></script... | <!-- Test framework libraries. -->
<script src="../../bower_components/mocha/mocha.js"></script>
<script src="../../bower_components/chai/chai.js"></script>
<script src="../../bower_components/chai-as-promised/lib/chai-as-promised.js"></script>
<script src="../../bower_components... | <|file_sep|>original/test/client/runner.html
<!-- Test framework libraries. -->
<script src="../../bower_components/mocha/mocha.js"></script>
<script src="../../bower_components/chai/chai.js"></script>
<script src="../../bower_components/chai-as-promised/lib/chai-as-promised.js"></script... | fab41c6bf2d7b1af2e20d2af5d451221a9d2973c | test/client/runner.html | test/client/runner.html | HTML |
<|file_sep|>original/src/openperipheral/integration/thermalexpansion/AdapterSecureTile.java
})
public boolean canPlayerAccess(ISecureTile tile, String name) {
return tile.canPlayerAccess(name);
}
@LuaMethod(description = "Gets the AccessMode of this machine.", returnType = LuaType.STRING)
public String getAcces... | }
@LuaMethod(description = "Gets the owner of the machine.", returnType = LuaType.STRING)
public String getOwnerName(ISecureTile tile) {
return tile.getOwnerName();
}
@LuaMethod(description = "Is this username allowed to access the machine.", returnType = LuaType.BOOLEAN, args = {
@Arg(name = "username", de... | <|file_sep|>original/src/openperipheral/integration/thermalexpansion/AdapterSecureTile.java
})
public boolean canPlayerAccess(ISecureTile tile, String name) {
return tile.canPlayerAccess(name);
}
@LuaMethod(description = "Gets the AccessMode of this machine.", returnType = LuaType.STRING)
public String getAcces... | d72cc1673fc105cd9d04cbaba814b58402c5e8f3 | src/openperipheral/integration/thermalexpansion/AdapterSecureTile.java | src/openperipheral/integration/thermalexpansion/AdapterSecureTile.java | Java |
<|file_sep|>original/webservice/database/migrations/2015_00_00_000002_create_types_table.php
class CreateTypesTable extends Migration
{
/**
* Run the migrations.
*/
public function up()
{
Schema::create('types', function (Blueprint $table) {
$table->increments('id');
... | class CreateTypesTable extends Migration
{
/**
* Run the migrations.
*/
public function up()
{
Schema::create('types', function (Blueprint $table) {
$table->increments('id');
$table->string('value');
$table->integer('parent_id')->nullable();
... | <|file_sep|>original/webservice/database/migrations/2015_00_00_000002_create_types_table.php
class CreateTypesTable extends Migration
{
/**
* Run the migrations.
*/
public function up()
{
Schema::create('types', function (Blueprint $table) {
$table->increments('id');
... | befbe6852b51952822ccf0b6fa2d4d37c2f96d37 | webservice/database/migrations/2015_00_00_000002_create_types_table.php | webservice/database/migrations/2015_00_00_000002_create_types_table.php | PHP |
<|file_sep|>.circleci/config.yml.diff
original:
- image: python:3.7
updated:
- image: python:3.8
<|file_sep|>.circleci/config.yml.diff
original:
updated:
build_37:
docker:
- image: python:3.7
steps:
- commonsteps
<|file_sep|>original/.circleci/config.yml
docker:
- image: py... | build_latest:
docker:
- image: python:latest
steps:
- commonsteps
workflows:
version: 2
workflow:
jobs:
- build_37
- build_target
- build_latest
check_latest:
triggers:
- schedule:
cron: "0 0 * * 0"
filters:
branches:
... | <|file_sep|>.circleci/config.yml.diff
original:
- image: python:3.7
updated:
- image: python:3.8
<|file_sep|>.circleci/config.yml.diff
original:
updated:
build_37:
docker:
- image: python:3.7
steps:
- commonsteps
<|file_sep|>original/.circleci/config.yml
docker:
- image: py... | cfe1f1d81e8402db1d7a1e9cc21547ff4ff123a8 | .circleci/config.yml | .circleci/config.yml | YAML |
<|file_sep|>original/spring-security/src/main/java/security/MvcConfig.java
<|file_sep|>current/spring-security/src/main/java/security/MvcConfig.java
<|file_sep|>updated/spring-security/src/main/java/security/MvcConfig.java | package security;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@Configuration
public class MvcConfig extends WebMvcConfigurerAdapter {
... | <|file_sep|>original/spring-security/src/main/java/security/MvcConfig.java
<|file_sep|>current/spring-security/src/main/java/security/MvcConfig.java
<|file_sep|>updated/spring-security/src/main/java/security/MvcConfig.java
package security;
import org.springframework.context.annotation.Configuration;
import org.spri... | 856601d2c765e98c5ceaca8fe746c39b0851252f | spring-security/src/main/java/security/MvcConfig.java | spring-security/src/main/java/security/MvcConfig.java | Java |
<|file_sep|>original/Resources/config/app/hwi_oauth.yml
<|file_sep|>current/Resources/config/app/hwi_oauth.yml
<|file_sep|>updated/Resources/config/app/hwi_oauth.yml | hwi_oauth:
firewall_names:
- public_area
resource_owners:
darvin_auth:
type: oauth2
client_id: %darvin_auth_client_id%
client_secret: %darvin_auth_client_secret%
access_token_url: %darvin_auth_access_token_url%
... | <|file_sep|>original/Resources/config/app/hwi_oauth.yml
<|file_sep|>current/Resources/config/app/hwi_oauth.yml
<|file_sep|>updated/Resources/config/app/hwi_oauth.yml
hwi_oauth:
firewall_names:
- public_area
resource_owners:
darvin_auth:
type: oauth2
clien... | 32ab06a2be59e12e0ca0094c06ef9bf1a7ade16d | Resources/config/app/hwi_oauth.yml | Resources/config/app/hwi_oauth.yml | YAML |
<|file_sep|>original/test/controllers/activities_controller_test.rb
class ActivitiesControllerTest < ActionController::TestCase
test "creating an activity" do
assert_difference('Activity.count') do
post :create, activity: {name: "Surfing"}
end
assert assigns(:activity)
end
test "creating an a... |
assert assigns(:activity)
end
test "creating an activity without name must fail" do
assert_raises ActionController::ParameterMissing do
post :create, activity: {}
end
end
test "obtaining a list of activities" do
get :index, date_start: Date.parse("2014-01-01"), date_end: Date.parse("201... | <|file_sep|>original/test/controllers/activities_controller_test.rb
class ActivitiesControllerTest < ActionController::TestCase
test "creating an activity" do
assert_difference('Activity.count') do
post :create, activity: {name: "Surfing"}
end
assert assigns(:activity)
end
test "creating an a... | 43949cb6ee979e65e9fa173b23a6173aaf7b3877 | test/controllers/activities_controller_test.rb | test/controllers/activities_controller_test.rb | Ruby |
<|file_sep|>original/cmd/bulk-add-csv-ui/web/static/css/styles.css
html {
font-family: sans-serif;
}
#saveCSVSubmit {
width: 100%;
display: block;
margin-bottom: 10px;
}
#err {
background: #f2dede;
display: block;
padding: 15px;
margin-bottom: 10px;
color: #333;
}
<|file_sep|>current... | html {
font-family: sans-serif;
}
input {
margin-bottom: 0.6em;
}
#err {
background: #f2dede;
display: block;
padding: 15px;
margin-bottom: 10px;
color: #333;
} | <|file_sep|>original/cmd/bulk-add-csv-ui/web/static/css/styles.css
html {
font-family: sans-serif;
}
#saveCSVSubmit {
width: 100%;
display: block;
margin-bottom: 10px;
}
#err {
background: #f2dede;
display: block;
padding: 15px;
margin-bottom: 10px;
color: #333;
}
<|file_sep|>current... | d3a3fb8ecf184b511cb4f6ea4d9ea48842169b15 | cmd/bulk-add-csv-ui/web/static/css/styles.css | cmd/bulk-add-csv-ui/web/static/css/styles.css | CSS |
<|file_sep|>original/script/functions.php
<?
/* Site-wide utility functions */
require_once('secureConstants.php');
function mysqliConn() {
$db = new mysqli(
$GLOBALS['DB']['SERVER'],
$GLOBALS['DB']['USERNAME'],
$GOLBALS['DB']['PASSWORD'],
$GLOBALS['DB']['DATABASE']
);
if ($db->connect_errno) {
header('... | <?php
/* Site-wide utility functions */
require_once('secureConstants.php');
function mysqliConn() {
$db = new mysqli(
$GLOBALS['DB']['SERVER'],
$GLOBALS['DB']['USERNAME'],
$GOLBALS['DB']['PASSWORD'],
$GLOBALS['DB']['DATABASE']
);
if ($db->connect_errno) {
header('HTTP/1.1 500 Internal Server Error');
... | <|file_sep|>original/script/functions.php
<?
/* Site-wide utility functions */
require_once('secureConstants.php');
function mysqliConn() {
$db = new mysqli(
$GLOBALS['DB']['SERVER'],
$GLOBALS['DB']['USERNAME'],
$GOLBALS['DB']['PASSWORD'],
$GLOBALS['DB']['DATABASE']
);
if ($db->connect_errno) {
header('... | fb29df7c66e2190fa17d89446c6e10cdd75cc238 | script/functions.php | script/functions.php | PHP |
<|file_sep|>original/n3-composer/assets/css/style.css
.paddingRecipients {
padding-top: 1em;
}
.noPadding {
padding: 0em !important;
}
.expensesTable td, .expensesTable th {
text-align: center;
}
.balanceAccountPadding {
padding-top: 6em;
}
#is_balance_account_approval_for_org, #is_budget_approval_for_org... |
.noPadding {
padding: 0em !important;
}
.expensesTable td, .expensesTable th {
text-align: center;
}
.balanceAccountPadding {
padding-top: 6em;
}
#is_balance_account_approval_for_org, #is_budget_approval_for_org {
display: block;
margin: 0 auto;
}
.expensesWithKae td {
vertical-align: middle !importan... | <|file_sep|>original/n3-composer/assets/css/style.css
.paddingRecipients {
padding-top: 1em;
}
.noPadding {
padding: 0em !important;
}
.expensesTable td, .expensesTable th {
text-align: center;
}
.balanceAccountPadding {
padding-top: 6em;
}
#is_balance_account_approval_for_org, #is_budget_approval_for_org... | e049441c8e0c14535f766b6ff8d05c47095b80b9 | n3-composer/assets/css/style.css | n3-composer/assets/css/style.css | CSS |
<|file_sep|>dcpu16/instructions/set.rb.diff
original:
updated:
when 0x00..0x07
emulator.registers[@b]
when 0x08..0x0F
emulator.memory[emulator.registers[@b - 0x08]]
when 0x10..0x17
emulator.memory[@next_word_b + emulator.registers[@b - 0x10]]
when 0x1b
... | emulator.memory[emulator.registers[@a - 0x08]] = value
when 0x10..0x17
emulator.memory[@next_word_a + emulator.registers[@a - 0x10]] = value
when 0x1b
emulator.sp = value
when 0x1c
emulator.pc = value
when 0x1d
p "You tried to assign 0!"
... | <|file_sep|>dcpu16/instructions/set.rb.diff
original:
updated:
when 0x00..0x07
emulator.registers[@b]
when 0x08..0x0F
emulator.memory[emulator.registers[@b - 0x08]]
when 0x10..0x17
emulator.memory[@next_word_b + emulator.registers[@b - 0x10]]
when 0x1b
... | 8af8bf123be51b2ab78bc373224bbc35a738aa3d | dcpu16/instructions/set.rb | dcpu16/instructions/set.rb | Ruby |
<|file_sep|>original/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md
<|file_sep|>current/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md
<|file_sep|>updated/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md | ---
title: Extraterm v0.41.1 released
date: 2019-03-23 09:30:00 +0100
categories: release
---
Bug fixes:
* Pasting blocks of text correctly handles line endings. [issue 164](https://github.com/sedwards2009/extraterm/issues/164), [issue 167](https://github.com/sedwards2009/extraterm/issues/167)
* "Type selection" and ... | <|file_sep|>original/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md
<|file_sep|>current/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md
<|file_sep|>updated/docs/_posts/2019-03-23-extraterm-v0.41.1-released.md
---
title: Extraterm v0.41.1 released
date: 2019-03-23 09:30:00 +0100
categories: release
---
Bug... | 0aadfd14f52d722b105930b4ede2c6742318b245 | docs/_posts/2019-03-23-extraterm-v0.41.1-released.md | docs/_posts/2019-03-23-extraterm-v0.41.1-released.md | Markdown |
<|file_sep|>ReactiveCocoa/NSNotificationCenterExtensions.swift.diff
original:
updated:
let disposable = ScopedDisposable(SerialDisposable())
<|file_sep|>ReactiveCocoa/NSNotificationCenterExtensions.swift.diff
original:
// TODO: Figure out how to deregister from this.
self.addObserverForName(name, object: obje... | import Foundation
extension NSNotificationCenter {
/// Returns a Signal of the latest posted notification that matches the
/// given criteria.
func rac_notifications(name: String? = nil, object: AnyObject? = nil) -> Signal<NSNotification?> {
let disposable = ScopedDisposable(SerialDisposable())
return Signal(i... | <|file_sep|>ReactiveCocoa/NSNotificationCenterExtensions.swift.diff
original:
updated:
let disposable = ScopedDisposable(SerialDisposable())
<|file_sep|>ReactiveCocoa/NSNotificationCenterExtensions.swift.diff
original:
// TODO: Figure out how to deregister from this.
self.addObserverForName(name, object: obje... | 3d856bac683d89dd030ec28a58eda7f9dbb5eeec | ReactiveCocoa/NSNotificationCenterExtensions.swift | ReactiveCocoa/NSNotificationCenterExtensions.swift | Swift |
<|file_sep|>original/tools/appveyor/windows_tests/before_test.bat
cd bin
:: ### Clone MNE-CPP test data ###
call git clone https://github.com/mne-tools/mne-cpp-test-data.git mne-cpp-test-data
cd ..
<|file_sep|>current/tools/appveyor/windows_tests/before_test.bat
cd bin
:: ### Clone MNE-CPP test data ###
call git c... |
cd bin
:: ### Clone MNE-CPP test data ###
:: call git clone https://github.com/mne-tools/mne-cpp-test-data.git mne-cpp-test-data
cd .. | <|file_sep|>original/tools/appveyor/windows_tests/before_test.bat
cd bin
:: ### Clone MNE-CPP test data ###
call git clone https://github.com/mne-tools/mne-cpp-test-data.git mne-cpp-test-data
cd ..
<|file_sep|>current/tools/appveyor/windows_tests/before_test.bat
cd bin
:: ### Clone MNE-CPP test data ###
call git c... | 770073ae6ba0d5f166f915a01aa56e02967060b3 | tools/appveyor/windows_tests/before_test.bat | tools/appveyor/windows_tests/before_test.bat | Batchfile |
<|file_sep|>original/resultProcessor/structsMatchCriteria.go
IgnoreViolationWithCriteriaMatch bool
PreviousViolationCheck bool
CountIf string
DescriptionRegexp []string
NotDescriptionRegexp []string
PluginID int
Ports ... | IgnoreViolationWithCriteriaMatch bool
PreviousViolationCheck bool
CountIf string
DescriptionRegexp []string
NotDescriptionRegexp []string
PluginID int
Ports []int
OrganizationIDs []i... | <|file_sep|>original/resultProcessor/structsMatchCriteria.go
IgnoreViolationWithCriteriaMatch bool
PreviousViolationCheck bool
CountIf string
DescriptionRegexp []string
NotDescriptionRegexp []string
PluginID int
Ports ... | abcb562402dffca3006b3e20273841c0293c21cf | resultProcessor/structsMatchCriteria.go | resultProcessor/structsMatchCriteria.go | Go |
<|file_sep|>src/lavatory/utils/get_artifactory_info.py.diff
original:
updated:
import requests
<|file_sep|>original/src/lavatory/utils/get_artifactory_info.py
"""Helper method for getting artifactory information."""
import logging
from .artifactory import Artifactory
def get_artifactory_info(repo_names=None, repo_... | """Helper method for getting artifactory information."""
import logging
import requests
from .artifactory import Artifactory
def _artifactory(artifactory=None, repo_names=None):
if not artifactory:
artifactory = Artifactory(repo_name=repo_names)
return artifactory
def get_storage(repo_names=None, ... | <|file_sep|>src/lavatory/utils/get_artifactory_info.py.diff
original:
updated:
import requests
<|file_sep|>original/src/lavatory/utils/get_artifactory_info.py
"""Helper method for getting artifactory information."""
import logging
from .artifactory import Artifactory
def get_artifactory_info(repo_names=None, repo_... | 739cf9a93afd9c742675e24cc637634e67d2c3b9 | src/lavatory/utils/get_artifactory_info.py | src/lavatory/utils/get_artifactory_info.py | Python |
<|file_sep|>original/plugins/ant/ant.plugin.zsh
_ant_does_target_list_need_generating () {
[ ! -f .ant_targets ] && return 0;
[ build.xml -nt .ant_targets ] && return 0;
return 1;
}
_ant () {
if [ -f build.xml ]; then
if _ant_does_target_list_need_generating; then
ant -p | awk -F " " 'NR > 5 { print l... | _ant_does_target_list_need_generating () {
[ ! -f .ant_targets ] && return 0;
[ build.xml -nt .ant_targets ] && return 0;
return 1;
}
_ant () {
if [ -f build.xml ]; then
if _ant_does_target_list_need_generating; then
ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
... | <|file_sep|>original/plugins/ant/ant.plugin.zsh
_ant_does_target_list_need_generating () {
[ ! -f .ant_targets ] && return 0;
[ build.xml -nt .ant_targets ] && return 0;
return 1;
}
_ant () {
if [ -f build.xml ]; then
if _ant_does_target_list_need_generating; then
ant -p | awk -F " " 'NR > 5 { print l... | 349493a0b81ae98117ea1a115a92ba509476298f | plugins/ant/ant.plugin.zsh | plugins/ant/ant.plugin.zsh | Shell |
<|file_sep|>original/package.json
},
"homepage": "https://github.com/zrrrzzt/difi#readme",
"engines": {
"node": ">=8.16.0"
},
"scripts": {
"test": "standard && npm audit && tap --reporter=spec test/**/*.js",
"coverage": "tap test/**/*.js --coverage",
"coveralls": "tap --cov --coverage-report=l... | },
"homepage": "https://github.com/zrrrzzt/difi#readme",
"engines": {
"node": ">=8.16.0"
},
"scripts": {
"test": "standard && npm audit && tap --reporter=spec test/**/*.js",
"coverage": "tap test/**/*.js --coverage",
"coveralls": "tap --cov --coverage-report=lcov test/**/*.js && cat coverage/l... | <|file_sep|>original/package.json
},
"homepage": "https://github.com/zrrrzzt/difi#readme",
"engines": {
"node": ">=8.16.0"
},
"scripts": {
"test": "standard && npm audit && tap --reporter=spec test/**/*.js",
"coverage": "tap test/**/*.js --coverage",
"coveralls": "tap --cov --coverage-report=l... | ece9dd4995c2e17ad29b63a71c75a70c151a3745 | package.json | package.json | JSON |
<|file_sep|>Casks/adium-nightly16.rb.diff
original:
url "http://nightly.adium.im/adium-adium-1.6/Adium_#{version}.dmg"
updated:
url "http://nightly.adium.im/adium-adium-1.6/Adium_#{version}.dmg
name 'Adium'
<|file_sep|>Casks/adium-nightly16.rb.diff
original:
license :oss
updated:
license :gpl
<|file_sep|>orig... | cask :v1 => 'adium-nightly16' do
version '1.6hgr5915'
sha256 '70619777433df646a7251a10eb74baecdc5a47be085cd83d35f3750fcfea9e1b'
url "http://nightly.adium.im/adium-adium-1.6/Adium_#{version}.dmg
name 'Adium'
homepage 'http://nightly.adium.im/?repo_branch=adium-adium-1.6'
license :gpl
app 'Adium.app'
z... | <|file_sep|>Casks/adium-nightly16.rb.diff
original:
url "http://nightly.adium.im/adium-adium-1.6/Adium_#{version}.dmg"
updated:
url "http://nightly.adium.im/adium-adium-1.6/Adium_#{version}.dmg
name 'Adium'
<|file_sep|>Casks/adium-nightly16.rb.diff
original:
license :oss
updated:
license :gpl
<|file_sep|>orig... | 99f8f278edc8600a8b28865f13f4d187210e6f41 | Casks/adium-nightly16.rb | Casks/adium-nightly16.rb | Ruby |
<|file_sep|>original/windows-start.bat
<|file_sep|>current/windows-start.bat
<|file_sep|>updated/windows-start.bat | @echo off
@title AvaIre Windows Launcher
setlocal enabledelayedexpansion
set Looping=False
cls
:START
echo.
echo Welcome to AvaIre's window launcher
echo Please select an option to begin:
echo.
echo 1. Start the bot normally
echo 2. Start the bot with automatic restarts
echo 3. Update the bot using the nigh... | <|file_sep|>original/windows-start.bat
<|file_sep|>current/windows-start.bat
<|file_sep|>updated/windows-start.bat
@echo off
@title AvaIre Windows Launcher
setlocal enabledelayedexpansion
set Looping=False
cls
:START
echo.
echo Welcome to AvaIre's window launcher
echo Please select an option to begin:
echo.
echo ... | 55c7cf1f507b8ea1f2ca53dcfd80ec0ffc6a4167 | windows-start.bat | windows-start.bat | Batchfile |
<|file_sep|>original/README.md
python-hangman
==============
Hangman written in Python as a practice for learning Python
<|file_sep|>current/README.md
python-hangman
==============
Hangman written in Python as a practice for learning Python
<|file_sep|>updated/README.md | python-hangman
==============
Hangman written in Python as a practice for learning Python
## Running the application
``
$ python hangman.py
``
Tested on Python v2.6.6 | <|file_sep|>original/README.md
python-hangman
==============
Hangman written in Python as a practice for learning Python
<|file_sep|>current/README.md
python-hangman
==============
Hangman written in Python as a practice for learning Python
<|file_sep|>updated/README.md
python-hangman
==============
Hangman written ... | b402d32671a28ef35eeb54e2e0f4013c131d472f | README.md | README.md | Markdown |
<|file_sep|>original/lib/domtrix_lb_config.rb
require 'json'
require 'erb'
class LoadBalancerConfig
def initialize(json_config, template)
@config = JSON.parse(json_config)
@template = template
end
def lb_id
@config["id"]
end
def listeners
@config['listeners'] || []
end
def nodes
@... | require 'json'
require 'erb'
class LoadBalancerConfig
def initialize(json_config, template)
@config = JSON.parse(json_config)
@template = template
end
def healthcheck
@config["healthcheck"]
end
def healthcheck_request
(healthcheck && healthcheck["request"]) || "/"
end
def healthcheck_... | <|file_sep|>original/lib/domtrix_lb_config.rb
require 'json'
require 'erb'
class LoadBalancerConfig
def initialize(json_config, template)
@config = JSON.parse(json_config)
@template = template
end
def lb_id
@config["id"]
end
def listeners
@config['listeners'] || []
end
def nodes
@... | 49d3b1dd0091e5d840fdd26b649ef4965d3672a3 | lib/domtrix_lb_config.rb | lib/domtrix_lb_config.rb | Ruby |
<|file_sep|>original/.expeditor/config.yml
# is bumped automatically via the `built_in:bump_version` merge_action.
version_file: "VERSION"
# The file where our CHANGELOG is kept. This file is updated automatically with
# details from the Pull Request via the `built_in:update_changelog` merge_action.
changelog... |
# These actions are taken, in order they are specified, anytime a Pull Request is merged.
merge_actions:
- built_in:update_changelog:
ignore_labels:
- "Expeditor: Exclude from Changelog"
changelog:
categories:
- "X-change": "Behavioral Changes"
- "X-feature": "New Features & Enhancements"
... | <|file_sep|>original/.expeditor/config.yml
# is bumped automatically via the `built_in:bump_version` merge_action.
version_file: "VERSION"
# The file where our CHANGELOG is kept. This file is updated automatically with
# details from the Pull Request via the `built_in:update_changelog` merge_action.
changelog... | 3ba5f7a0d5fdc30bc453a2ecd164a7d12040d9fd | .expeditor/config.yml | .expeditor/config.yml | YAML |
<|file_sep|>original/packages/at/atlas.yaml
<|file_sep|>current/packages/at/atlas.yaml
<|file_sep|>updated/packages/at/atlas.yaml | homepage: https://github.com/ekmett/codex/tree/master/atlas#readme
changelog-type: markdown
hash: 32c168b5b9fd4e843376ca9eb02ef33b233392cdbbcbf0b87c5f2cee00209861
test-bench-deps:
base: '>=4.11 && <5'
hspec: -any
transformers: -any
atlas: -any
primitive: -any
maintainer: Edward Kmett <ekmett@gmail.com>
synops... | <|file_sep|>original/packages/at/atlas.yaml
<|file_sep|>current/packages/at/atlas.yaml
<|file_sep|>updated/packages/at/atlas.yaml
homepage: https://github.com/ekmett/codex/tree/master/atlas#readme
changelog-type: markdown
hash: 32c168b5b9fd4e843376ca9eb02ef33b233392cdbbcbf0b87c5f2cee00209861
test-bench-deps:
base: ... | a1ae06c11911989c73189f4e1ea3237b2f77d6ff | packages/at/atlas.yaml | packages/at/atlas.yaml | YAML |
<|file_sep|>original/app/src/main/res/menu/menu_home_people.xml
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/short_by_latest"
android:title="@string/short_by_la... | <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:title=""
android:id="@+id/setting"
android:icon="@drawable/ic_setting"
app:showAsAction="always">
<m... | <|file_sep|>original/app/src/main/res/menu/menu_home_people.xml
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/short_by_latest"
android:title="@string/short_by_la... | d6a75c13b327a6d39b45488af5c18e3520f8256b | app/src/main/res/menu/menu_home_people.xml | app/src/main/res/menu/menu_home_people.xml | XML |
<|file_sep|>original/public/styles/main.css
body {
font-family: Droid Sans, Arial, sans-serif;
font-size: 14px;
}
input[name=url] {
width: 45em;
}
input[name=width],
input[name=height] {
width: 5em;
}
<|file_sep|>current/public/styles/main.css
body {
font-family: Droid Sans, Arial, sans-serif;
... | body {
font: 14px/1.4 "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
}
input[name=url] {
width: 45em;
}
input[name=width],
input[name=height] {
width: 5em;
}
| <|file_sep|>original/public/styles/main.css
body {
font-family: Droid Sans, Arial, sans-serif;
font-size: 14px;
}
input[name=url] {
width: 45em;
}
input[name=width],
input[name=height] {
width: 5em;
}
<|file_sep|>current/public/styles/main.css
body {
font-family: Droid Sans, Arial, sans-serif;
... | d7b26a4956245a7949f3372d6fd3b7a9669bb9fd | public/styles/main.css | public/styles/main.css | CSS |
<|file_sep|>original/tests/main.rs
#[macro_use] extern crate match_any;
use std::any::Any;
fn make_any<T: Any>(value: T) -> Box<Any> {
Box::new(value)
}
#[test]
fn empty() {
match_any!(make_any(10) =>
x: i32 => {
assert_eq!(*x, 10);
}
);
}
// TODO: Add.
// #[bench]
<|file_s... | #[macro_use] extern crate match_any;
use std::any::Any;
fn make_any<T: Any>(value: T) -> Box<Any> {
Box::new(value)
}
#[test]
fn match_i32() {
match_any!(make_any(10) =>
x: i32 => {
assert_eq!(*x, 10);
}
);
}
// TODO: Add.
// #[bench] | <|file_sep|>original/tests/main.rs
#[macro_use] extern crate match_any;
use std::any::Any;
fn make_any<T: Any>(value: T) -> Box<Any> {
Box::new(value)
}
#[test]
fn empty() {
match_any!(make_any(10) =>
x: i32 => {
assert_eq!(*x, 10);
}
);
}
// TODO: Add.
// #[bench]
<|file_s... | 4864958aefdcaf77e3c5532a948ca40146934389 | tests/main.rs | tests/main.rs | Rust |
<|file_sep|>lumify-web-dev-tools/src/main/resources/requeue.html.diff
original:
<input type="hidden" value="csrfToken">
updated:
<input type="hidden" name="csrfToken">
<|file_sep|>lumify-web-dev-tools/src/main/resources/requeue.html.diff
original:
<input type="hidden" value="csrfToken">
updated:
<input ... |
<form method="POST" action="/admin/queueEdges">
<input type="hidden" name="csrfToken">
<input type="submit" value="Re-queue Edges" disabled>
</form>
<script>
$(function() {
$.get('/user/me')
.fail(function() {
alert('Not logged in or no token');
})
... | <|file_sep|>lumify-web-dev-tools/src/main/resources/requeue.html.diff
original:
<input type="hidden" value="csrfToken">
updated:
<input type="hidden" name="csrfToken">
<|file_sep|>lumify-web-dev-tools/src/main/resources/requeue.html.diff
original:
<input type="hidden" value="csrfToken">
updated:
<input ... | fb2cfee06ba7bc71c6961a94af7c40caf66899d9 | lumify-web-dev-tools/src/main/resources/requeue.html | lumify-web-dev-tools/src/main/resources/requeue.html | HTML |
<|file_sep|>java-library-tester/src/test/java/study/hard/javalib/file/FileTest.java.diff
original:
updated:
@Test
public void testGetTempDirectoryPath() {
File tempDirectory = new File(System.getProperty("java.io.tmpdir"));
System.out.println(tempDirectory);
}
<|file_sep|>original/java-library-tester/src/test/... | }
@Test
public void testCreateTempFile() throws IOException {
tempFile = fileHandler.getTempFile("TEST_TEMP_FILE.txt");
System.out.println("Absolute path of temporary file: " + tempFile.getAbsolutePath());
}
@Test
public void testGetTempDirectoryPath() {
File tempDirectory = new File(System.getProperty("j... | <|file_sep|>java-library-tester/src/test/java/study/hard/javalib/file/FileTest.java.diff
original:
updated:
@Test
public void testGetTempDirectoryPath() {
File tempDirectory = new File(System.getProperty("java.io.tmpdir"));
System.out.println(tempDirectory);
}
<|file_sep|>original/java-library-tester/src/test/... | a6861c4522d152f701c21bf99f8d9deda8df642e | java-library-tester/src/test/java/study/hard/javalib/file/FileTest.java | java-library-tester/src/test/java/study/hard/javalib/file/FileTest.java | Java |
<|file_sep|>original/package.json
{
"name": "react-native-azure-adal",
"version": "1.0.2",
"description": "Active Directory Authentication Library (ADAL) plugin provides easy to use authentication functionality for your React Native apps by taking advantage of Windows Server Active Directory and Windows Azure Act... | {
"name": "react-native-azure-adal",
"version": "1.0.3",
"description": "Active Directory Authentication Library (ADAL) plugin provides easy to use authentication functionality for your React Native apps by taking advantage of Windows Server Active Directory and Windows Azure Active Directory.",
"main": "index.... | <|file_sep|>original/package.json
{
"name": "react-native-azure-adal",
"version": "1.0.2",
"description": "Active Directory Authentication Library (ADAL) plugin provides easy to use authentication functionality for your React Native apps by taking advantage of Windows Server Active Directory and Windows Azure Act... | f30abd90b85a200464bac2d63680620bb60fecb5 | package.json | package.json | JSON |
<|file_sep|>scikits/learn/tests/test_pca.py.diff
original:
from nose.tools import assert_equals
updated:
import numpy as np
<|file_sep|>scikits/learn/tests/test_pca.py.diff
original:
assert_equals(X_r.shape[1], 2)
updated:
np.testing.assert_equal(X_r.shape[1], 2)
<|file_sep|>original/scikits/learn/tests/test_pc... | import numpy as np
from .. import datasets
from ..pca import PCA
iris = datasets.load_iris()
X = iris.data
def test_pca():
"""
PCA
"""
pca = PCA(k=2)
X_r = pca.fit(X).transform(X)
np.testing.assert_equal(X_r.shape[1], 2)
pca = PCA()
pca.fit(X)
np.testing.assert_almost_equal(pca... | <|file_sep|>scikits/learn/tests/test_pca.py.diff
original:
from nose.tools import assert_equals
updated:
import numpy as np
<|file_sep|>scikits/learn/tests/test_pca.py.diff
original:
assert_equals(X_r.shape[1], 2)
updated:
np.testing.assert_equal(X_r.shape[1], 2)
<|file_sep|>original/scikits/learn/tests/test_pc... | a1b47d442290ea9ce19e25cd03c1aa5e39ad2ec5 | scikits/learn/tests/test_pca.py | scikits/learn/tests/test_pca.py | Python |
<|file_sep|>original/.travis.yml
language: python
python:
- "2.7"
# command to install dependencies
install:
- "pip install tox"
# command to run tests
script:
- tox
env:
- TOXENV=py27
- TOXENV=pep8
- TOXENV=pylint-errors
<|file_sep|>current/.travis.yml
language: python
python:
- "2.7"
# command to instal... | language: python
python:
- "2.7"
# command to install dependencies
install:
- "pip install tox"
# command to run tests
script:
- tox
env:
- TOXENV=py27 | <|file_sep|>original/.travis.yml
language: python
python:
- "2.7"
# command to install dependencies
install:
- "pip install tox"
# command to run tests
script:
- tox
env:
- TOXENV=py27
- TOXENV=pep8
- TOXENV=pylint-errors
<|file_sep|>current/.travis.yml
language: python
python:
- "2.7"
# command to instal... | 1d9043aa9337fd442e42e63bba743843bd9fc0bc | .travis.yml | .travis.yml | YAML |
<|file_sep|>original/components/Board/IconButton.tsx
import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { ButtonHTMLAttributes, DetailedHTMLProps } from "react";
type Props = DetailedHTMLProps<
ButtonHTMLAttributes<HTMLButtonEl... | import type { IconDefinition } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { ButtonHTMLAttributes, DetailedHTMLProps } from "react";
type Props = DetailedHTMLProps<
ButtonHTMLAttributes<HTMLButtonElement>,
HTMLButtonElement
> & {
icon: IconDe... | <|file_sep|>original/components/Board/IconButton.tsx
import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { ButtonHTMLAttributes, DetailedHTMLProps } from "react";
type Props = DetailedHTMLProps<
ButtonHTMLAttributes<HTMLButtonEl... | 36470bce52fb29eb63c516653cbb835a27b86655 | components/Board/IconButton.tsx | components/Board/IconButton.tsx | TypeScript |
<|file_sep|>original/gradle.properties
group=com.linecorp.armeria
version=0.73.1-SNAPSHOT
projectName=Armeria
projectUrl=https://line.github.io/armeria/
projectDescription=Asynchronous HTTP/2 RPC/REST client/server library built on top of Java 8, Netty, Thrift and gRPC
authorName=LINE Corporation
authorEmail=dl_oss_dev... | group=com.linecorp.armeria
version=0.74.1-SNAPSHOT
projectName=Armeria
projectUrl=https://line.github.io/armeria/
projectDescription=Asynchronous HTTP/2 RPC/REST client/server library built on top of Java 8, Netty, Thrift and gRPC
authorName=LINE Corporation
authorEmail=dl_oss_dev@linecorp.com
authorUrl=https://enginee... | <|file_sep|>original/gradle.properties
group=com.linecorp.armeria
version=0.73.1-SNAPSHOT
projectName=Armeria
projectUrl=https://line.github.io/armeria/
projectDescription=Asynchronous HTTP/2 RPC/REST client/server library built on top of Java 8, Netty, Thrift and gRPC
authorName=LINE Corporation
authorEmail=dl_oss_dev... | 8e8c5f8e39b41aab3fba6b7acf71885272902969 | gradle.properties | gradle.properties | INI |
<|file_sep|>original/app/controllers/sessions_controller.rb
# This controller handles the login/logout function of the site.
class SessionsController < ApplicationController
# Be sure to include AuthenticationSystem in Application Controller instead
include AuthenticatedSystem
# render new.rhtml
def new
en... | # This controller handles the login/logout function of the site.
class SessionsController < ApplicationController
# render new.rhtml
def new
end
def create
logout_keeping_session!
user = User.authenticate(params[:login], params[:password])
if user
# Protects against session fixation attack... | <|file_sep|>original/app/controllers/sessions_controller.rb
# This controller handles the login/logout function of the site.
class SessionsController < ApplicationController
# Be sure to include AuthenticationSystem in Application Controller instead
include AuthenticatedSystem
# render new.rhtml
def new
en... | 4844ea2990ca576749d47751983710b11e7ae278 | app/controllers/sessions_controller.rb | app/controllers/sessions_controller.rb | Ruby |
<|file_sep|>original/doc/getting_started.rst
Run:
```
git clone https://github.com/openego/eTraGo
```
Create a virtualenvironment (where you like it) and activate it:
```
virtualenv -p python3 venv
source venv/bin/activate
```
With your activated environment `cd` to the cloned directory a... | source venv/bin/activate
```
With your activated environment `cd` to the cloned directory and run:
```
pip install -e eTraGo
```
This will install all needed packages into your environment. Now you should be ready to go.
Setup for windows users
-----------------------------------
- install anac... | <|file_sep|>original/doc/getting_started.rst
Run:
```
git clone https://github.com/openego/eTraGo
```
Create a virtualenvironment (where you like it) and activate it:
```
virtualenv -p python3 venv
source venv/bin/activate
```
With your activated environment `cd` to the cloned directory a... | ebe1cdc33d574e9e64ae1e273cc6c88c0df28b40 | doc/getting_started.rst | doc/getting_started.rst | reStructuredText |
<|file_sep|>original/_includes/highlight_post.html
<div class="section-highlight section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp">
<header class="section__play-btn mdl-cell mdl-cell--3-col-desktop mdl-cell--2-col-tablet mdl-cell--4-col-phone" {% if post.image %} style="background: url('{{ post.image }}... | <div class="section-highlight section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp">
<header class="section__play-btn mdl-cell mdl-cell--3-col-desktop mdl-cell--2-col-tablet mdl-cell--4-col-phone" {% if post.image %} style="background: url('{{ post.image }}') center/cover;" {% endif %}></header>
<div cla... | <|file_sep|>original/_includes/highlight_post.html
<div class="section-highlight section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp">
<header class="section__play-btn mdl-cell mdl-cell--3-col-desktop mdl-cell--2-col-tablet mdl-cell--4-col-phone" {% if post.image %} style="background: url('{{ post.image }}... | 24744f2a0d867a1111a3e029461bc0fd53aa82a0 | _includes/highlight_post.html | _includes/highlight_post.html | HTML |
<|file_sep|>original/setup.py
from setuptools import setup, find_packages
import sys, os
version = '0.1.0'
setup(name='mytardisbf',
version=version,
description="Bioformats App for MyTardis",
long_description="""\
Bioformats App for extracting metadata and thumbnails from microscopy images\
in MyTar... | from setuptools import setup, find_packages
import sys, os
version = '0.2.0'
setup(name='mytardisbf',
version=version,
description="Bioformats App for MyTardis",
long_description="""\
Bioformats App for extracting metadata and thumbnails from microscopy images\
in MyTardis""",
classifiers=[], ... | <|file_sep|>original/setup.py
from setuptools import setup, find_packages
import sys, os
version = '0.1.0'
setup(name='mytardisbf',
version=version,
description="Bioformats App for MyTardis",
long_description="""\
Bioformats App for extracting metadata and thumbnails from microscopy images\
in MyTar... | 9bc09627813c446bc5e155f92a2f03a7bde56d88 | setup.py | setup.py | Python |
<|file_sep|>original/plugins/cue_points/base/batch/copyCuePoints/Engine/KLiveClippingCopyCuePointEngine.php
*/
class KLiveClippingCopyCuePointEngine extends KLiveToVodCopyCuePointEngine
{
//override set status to HANDLED as LiveToVod engine
protected static function postProcessCuePoints($copiedCuePointIds) {}
... | */
class KLiveClippingCopyCuePointEngine extends KLiveToVodCopyCuePointEngine
{
//override set status to HANDLED as LiveToVod engine
protected static function postProcessCuePoints($copiedCuePointIds) {}
protected function shouldCopyCuePoint($cuePoint)
{
$cuePointStartTime = $this->getOffsetFor... | <|file_sep|>original/plugins/cue_points/base/batch/copyCuePoints/Engine/KLiveClippingCopyCuePointEngine.php
*/
class KLiveClippingCopyCuePointEngine extends KLiveToVodCopyCuePointEngine
{
//override set status to HANDLED as LiveToVod engine
protected static function postProcessCuePoints($copiedCuePointIds) {}
... | 76a27e3c235eff7fe6723976e75d35bfa8be6757 | plugins/cue_points/base/batch/copyCuePoints/Engine/KLiveClippingCopyCuePointEngine.php | plugins/cue_points/base/batch/copyCuePoints/Engine/KLiveClippingCopyCuePointEngine.php | PHP |
<|file_sep|>src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig.diff
original:
updated:
{% if app.user %}
<|file_sep|>original/src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig
<script type="text/javascript">
require(['orosync/js/sync', 'oroui/js/messenger', 'o... | {% if app.user %}
<script type="text/javascript">
require(['orosync/js/sync', 'oroui/js/messenger', 'orotranslation/js/translator'],
function (sync, messenger, __) {
sync.subscribe('oro/imap_sync_fail_u_{{ app.user.id }}', function (response) {
messenger.notificationMessage(
... | <|file_sep|>src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig.diff
original:
updated:
{% if app.user %}
<|file_sep|>original/src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig
<script type="text/javascript">
require(['orosync/js/sync', 'oroui/js/messenger', 'o... | 184de6a711bbd05239a012ba043fe46cd0f81763 | src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig | src/Oro/Bundle/ImapBundle/Resources/views/credentialsTopicSubscribe.html.twig | Twig |
<|file_sep|>original/requirements.txt
click==7.1.2
entrypoints==0.3
requests==2.25.0
numpy==1.19.4
scipy==1.5.4
h5netcdf==0.8.1
h5py==3.1.0
pillow==8.0.1
ruamel.yaml==0.16.12
loguru==0.5.3
tqdm==4.54.0
<|file_sep|>current/requirements.txt
click==7.1.2
entrypoints==0.3
requests==2.25.0
numpy==1.19.4
scipy==1.5.4
h5netcd... | click==7.1.2
entrypoints==0.3
requests==2.25.0
numpy==1.19.4
scipy==1.5.4
h5netcdf==0.8.1
h5py==3.1.0
pillow==8.0.1
ruamel.yaml==0.16.12
loguru==0.5.3
tqdm==4.54.1 | <|file_sep|>original/requirements.txt
click==7.1.2
entrypoints==0.3
requests==2.25.0
numpy==1.19.4
scipy==1.5.4
h5netcdf==0.8.1
h5py==3.1.0
pillow==8.0.1
ruamel.yaml==0.16.12
loguru==0.5.3
tqdm==4.54.0
<|file_sep|>current/requirements.txt
click==7.1.2
entrypoints==0.3
requests==2.25.0
numpy==1.19.4
scipy==1.5.4
h5netcd... | 0850aaf5235aefbb1789e8654c9c41f111024338 | requirements.txt | requirements.txt | Text |
<|file_sep|>original/meta/main.yml
---
galaxy_info:
author: Ben Webber
description: Provision a vanilla Minecraft server
license: Apache 2.0
min_ansible_version: 1.2
platforms:
- name: Ubuntu
versions:
- trusty
- name: Debian
versions:
- wheezy
- jessie
categories:
- ... | ---
galaxy_info:
author: Ben Webber
description: Provision a vanilla Minecraft server
license: Apache 2.0
min_ansible_version: 1.2
platforms:
- name: Ubuntu
versions:
- trusty
- name: Debian
versions:
- wheezy
- jessie
- name: EL
versions:
- 7
categori... | <|file_sep|>original/meta/main.yml
---
galaxy_info:
author: Ben Webber
description: Provision a vanilla Minecraft server
license: Apache 2.0
min_ansible_version: 1.2
platforms:
- name: Ubuntu
versions:
- trusty
- name: Debian
versions:
- wheezy
- jessie
categories:
- ... | 78bb5490e6feaa353d4f09d8323730809fbb7a98 | meta/main.yml | meta/main.yml | YAML |
<|file_sep|>flake8_docstrings.py.diff
original:
__version__ = '0.2.0'
updated:
__version__ = '0.2.1'
<|file_sep|>original/flake8_docstrings.py
class pep257Checker(object):
"""flake8 needs a class to check python file."""
name = 'pep257'
version = __version__
def __init__(self, tree, filename='(none)'... |
__version__ = '0.2.1'
class pep257Checker(object):
"""flake8 needs a class to check python file."""
name = 'pep257'
version = __version__
def __init__(self, tree, filename='(none)', builtins=None):
self.tree = tree
self.filename = filename
def run(self):
"""Use directl... | <|file_sep|>flake8_docstrings.py.diff
original:
__version__ = '0.2.0'
updated:
__version__ = '0.2.1'
<|file_sep|>original/flake8_docstrings.py
class pep257Checker(object):
"""flake8 needs a class to check python file."""
name = 'pep257'
version = __version__
def __init__(self, tree, filename='(none)'... | 0989682ad858a6f14a1d387c24511b228881d645 | flake8_docstrings.py | flake8_docstrings.py | Python |
<|file_sep|>examples/README.md.diff
original:
## Strict
updated:
## How to run them
To run from your IDE tests inheriting from `GraalTest` (e.g. `@RunWith(GraalTest.class)`), you must define the `native.image.path` to the native image build of that specific example.
For example: `-Dnative.image.path=/full/qualified/pa... | # Examples of live applications
Examples exercising frameworks like Weld, Undertow etc using Shamrock as boot bed.
## How to run them
To run from your IDE tests inheriting from `GraalTest` (e.g. `@RunWith(GraalTest.class)`), you must define the `native.image.path` to the native image build of that specific example.
... | <|file_sep|>examples/README.md.diff
original:
## Strict
updated:
## How to run them
To run from your IDE tests inheriting from `GraalTest` (e.g. `@RunWith(GraalTest.class)`), you must define the `native.image.path` to the native image build of that specific example.
For example: `-Dnative.image.path=/full/qualified/pa... | a4f6471bb0fd79ed5102e36f211224909e1b5219 | examples/README.md | examples/README.md | Markdown |
<|file_sep|>original/app/controllers/Dashboard.coffee
Spine = require('spine')
_ = require('underscore/underscore')
ToolWindow = require('controllers/ToolWindow')
class Dashboard extends Spine.Controller
constructor: ->
super
elements:
'.tools': 'workspace'
tools: []
channels: []
sources: ["Ga... | _ = require('underscore/underscore')
ToolWindow = require('controllers/ToolWindow')
class Dashboard extends Spine.Controller
constructor: ->
super
elements:
'.tools': 'workspace'
tools: []
channels: []
sources: ["GalaxyZooSubject", "SkyServerSubject"]
count: 0
render: =>
@html require... | <|file_sep|>original/app/controllers/Dashboard.coffee
Spine = require('spine')
_ = require('underscore/underscore')
ToolWindow = require('controllers/ToolWindow')
class Dashboard extends Spine.Controller
constructor: ->
super
elements:
'.tools': 'workspace'
tools: []
channels: []
sources: ["Ga... | 2978928d1a3ffe93ea06d09d2b2cb007ef3750f0 | app/controllers/Dashboard.coffee | app/controllers/Dashboard.coffee | CoffeeScript |
<|file_sep|>original/libyaul/scu/bus/b/vdp1/vdp1/map.h
#include <scu-internal.h>
/* Macros specific for processor */
#define VDP1(x) (0x25D00000 + (x))
/* Helpers specific to this processor */
#define TVMR 0x0000
#define FBCR 0x0002
#define PTMR 0x0004
#define EWDR 0x0006
#define EWLR 0x0008
#define EW... |
#include <scu-internal.h>
/* Macros specific for processor */
#define VDP1(x) (0x25D00000 + (x))
/* Helpers specific to this processor */
#define TVMR 0x0000
#define FBCR 0x0002
#define PTMR 0x0004
#define EWDR 0x0006
#define EWLR 0x0008
#define EWRR 0x000A
#define ENDR 0x000C
#define EDSR 0x0010
#d... | <|file_sep|>original/libyaul/scu/bus/b/vdp1/vdp1/map.h
#include <scu-internal.h>
/* Macros specific for processor */
#define VDP1(x) (0x25D00000 + (x))
/* Helpers specific to this processor */
#define TVMR 0x0000
#define FBCR 0x0002
#define PTMR 0x0004
#define EWDR 0x0006
#define EWLR 0x0008
#define EW... | f779b0dc0bb152e1d1e9d4cab5de36c1ab1bf13e | libyaul/scu/bus/b/vdp1/vdp1/map.h | libyaul/scu/bus/b/vdp1/vdp1/map.h | C |
<|file_sep|>original/txircd/modules/cmode_s.py
from txircd.modbase import Mode
class SecretMode(Mode):
def listOutput(self, command, data):
if command != "LIST":
return data
cdata = data["cdata"]
if "s" in cdata["channel"].mode and cdata["channel"].name not in data["user"].channels:
data["cdata"] = {}
# ... | from txircd.modbase import Mode
class SecretMode(Mode):
def listOutput(self, command, data):
if command != "LIST":
return data
cdata = data["cdata"]
if "s" in cdata["channel"].mode and cdata["channel"].name not in data["user"].channels:
data["cdata"].clear()
# other +s stuff is hiding in other modules.
... | <|file_sep|>original/txircd/modules/cmode_s.py
from txircd.modbase import Mode
class SecretMode(Mode):
def listOutput(self, command, data):
if command != "LIST":
return data
cdata = data["cdata"]
if "s" in cdata["channel"].mode and cdata["channel"].name not in data["user"].channels:
data["cdata"] = {}
# ... | 4514c5c5644796413c01f6132b3b6afece73ce01 | txircd/modules/cmode_s.py | txircd/modules/cmode_s.py | Python |
<|file_sep|>app/src/main/java/com/kickstarter/models/Location.java.diff
original:
updated:
import android.support.annotation.Nullable;
<|file_sep|>app/src/main/java/com/kickstarter/models/Location.java.diff
original:
updated:
public abstract long id();
<|file_sep|>app/src/main/java/com/kickstarter/models/Location.j... |
@AutoGson
@AutoParcel
public abstract class Location implements Parcelable {
public abstract long id();
public abstract String displayableName();
public abstract String name();
@Nullable public abstract String city();
public abstract String state();
public abstract String country();
@Nullable public abst... | <|file_sep|>app/src/main/java/com/kickstarter/models/Location.java.diff
original:
updated:
import android.support.annotation.Nullable;
<|file_sep|>app/src/main/java/com/kickstarter/models/Location.java.diff
original:
updated:
public abstract long id();
<|file_sep|>app/src/main/java/com/kickstarter/models/Location.j... | 20ff38cf26334e98466a665c3b4d855e8df8bce0 | app/src/main/java/com/kickstarter/models/Location.java | app/src/main/java/com/kickstarter/models/Location.java | Java |
<|file_sep|>original/website/addons/wiki/templates/compare.mako
<%inherit file="project/project_base.mako"/>
<%def name="title()">${node['title']} Wiki (History)</%def>
<div class="wiki">
<div class="row">
<div class="col-md-3">
<%include file="wiki/templates/nav.mako"/>
<%include f... | <%inherit file="project/project_base.mako"/>
<%def name="title()">${node['title']} Wiki (History)</%def>
<div class="wiki">
<div class="row">
<div class="col-md-3">
<%include file="wiki/templates/nav.mako"/>
<%include file="wiki/templates/toc.mako"/>
</div>
<div clas... | <|file_sep|>original/website/addons/wiki/templates/compare.mako
<%inherit file="project/project_base.mako"/>
<%def name="title()">${node['title']} Wiki (History)</%def>
<div class="wiki">
<div class="row">
<div class="col-md-3">
<%include file="wiki/templates/nav.mako"/>
<%include f... | a540cc35f4d427c9cfb52532866e2e54d5e808e1 | website/addons/wiki/templates/compare.mako | website/addons/wiki/templates/compare.mako | Mako |
<|file_sep|>original/.travis.yml
sudo: false
language: php
php:
- 5.4
- 5.5
- 5.6
- hhvm
cache:
directories:
- vendor
before_script:
- composer install --dev --no-interaction --prefer-source
script:
- vendor/bin/phpunit --configuration phpunit.xml.dist --colors --coverage-clover=coverage.clover
after_scr... | sudo: false
language: php
php:
- 5.5
- 5.6
- hhvm
cache:
directories:
- vendor
before_script:
- composer install --dev --no-interaction --prefer-source
script:
- vendor/bin/phpunit --configuration phpunit.xml.dist --colors --coverage-clover=coverage.clover
after_script:
- wget https://scrutinizer-ci.co... | <|file_sep|>original/.travis.yml
sudo: false
language: php
php:
- 5.4
- 5.5
- 5.6
- hhvm
cache:
directories:
- vendor
before_script:
- composer install --dev --no-interaction --prefer-source
script:
- vendor/bin/phpunit --configuration phpunit.xml.dist --colors --coverage-clover=coverage.clover
after_scr... | d3dc5ca88682104c3db8f6fb772849473eb4b88e | .travis.yml | .travis.yml | YAML |
<|file_sep|>original/app/requirements/prod.txt
# Deployment
gunicorn>=19.1.1
# Assets
Flask-Assets==0.12
cssmin>=0.2.0
jsmin>=2.0.11
# Auth
Flask-Login==0.4.0
Flask-Bcrypt==0.7.1
# Caching
Flask-Caching>=1.0.0
# Debug toolbar
Flask-DebugToolbar==0.10.1
# Requests
requests==2.18.1
<|file_sep|>current/app/requireme... |
# Deployment
gunicorn>=19.1.1
# Assets
Flask-Assets==0.12
cssmin>=0.2.0
jsmin>=2.0.11
# Auth
Flask-Login==0.4.0
Flask-Bcrypt==0.7.1
# Caching
Flask-Caching>=1.0.0
# Debug toolbar
Flask-DebugToolbar==0.10.1
# Requests
requests==2.18.2 | <|file_sep|>original/app/requirements/prod.txt
# Deployment
gunicorn>=19.1.1
# Assets
Flask-Assets==0.12
cssmin>=0.2.0
jsmin>=2.0.11
# Auth
Flask-Login==0.4.0
Flask-Bcrypt==0.7.1
# Caching
Flask-Caching>=1.0.0
# Debug toolbar
Flask-DebugToolbar==0.10.1
# Requests
requests==2.18.1
<|file_sep|>current/app/requireme... | a3e7c3434e6ad4fdc58cce8305a1c79ca5145ed8 | app/requirements/prod.txt | app/requirements/prod.txt | Text |
<|file_sep|>lib/parelation/criteria/order/object.rb.diff
original:
updated:
# @return [Hash] the possible directions (asc, desc)
# for database queries.
#
DIRECTIONS = {
"asc" => :asc,
"desc" => :desc,
}
<|file_sep|>lib/parelation/criteria/order/object.rb.diff
original:
# eiter :asc or :desc.
... | private
# @return [String] the name of the field to perform the ordering on.
#
def field
parts.first || ""
end
# @return [Symbol, nil] the direction to order {#field},
# either :asc or :desc.
#
def direction
DIRECTIONS[parts.last]
end
# @return [Array<String, nil>] the criteria chunks... | <|file_sep|>lib/parelation/criteria/order/object.rb.diff
original:
updated:
# @return [Hash] the possible directions (asc, desc)
# for database queries.
#
DIRECTIONS = {
"asc" => :asc,
"desc" => :desc,
}
<|file_sep|>lib/parelation/criteria/order/object.rb.diff
original:
# eiter :asc or :desc.
... | b982d2bd7ba607c947b5ca614a193d4545fdbbf6 | lib/parelation/criteria/order/object.rb | lib/parelation/criteria/order/object.rb | Ruby |
<|file_sep|>original/index.js
/**
* A lightweight promise-based Reddit API wrapper.
* @module reddit-api
*/
exports = module.exports = Reddit;
function Reddit() {
this.baseApiUrl = 'http://www.reddit.com';
return this;
};
/**
* Logs in a Reddit user.
*
* @param {string} username
* @param {string} pa... | /**
* A lightweight promise-based Reddit API wrapper.
* @module reddit-api
*/
exports = module.exports = Reddit;
function Reddit() {
this._baseApiUrl = 'http://www.reddit.com';
return this;
};
/**
* Logs in a Reddit user.
*
* @param {string} username
* @param {string} password
*/
Reddit.prototype.l... | <|file_sep|>original/index.js
/**
* A lightweight promise-based Reddit API wrapper.
* @module reddit-api
*/
exports = module.exports = Reddit;
function Reddit() {
this.baseApiUrl = 'http://www.reddit.com';
return this;
};
/**
* Logs in a Reddit user.
*
* @param {string} username
* @param {string} pa... | 4dec8ace74bc153a67cd32b1e5be026bfbf852be | index.js | index.js | JavaScript |
<|file_sep|>original/README.md
#  [](https://magnum.travis-ci.com/RyanMcG/incise)
A hopefully simplified static site generator in Clojure.
## ... | #  [](https://travis-ci.org/RyanMcG/incise)
A hopefully simplified static site generator in Clojure.
## Usage
The main usage of this library is through its main method. This c... | <|file_sep|>original/README.md
#  [](https://magnum.travis-ci.com/RyanMcG/incise)
A hopefully simplified static site generator in Clojure.
## ... | 4ec9a2ad91c9bc9459d451a58d1d9ebb385e006a | README.md | README.md | Markdown |
<|file_sep|>original/lib/graphql/types/relay/base_connection.rb
# end
#
# # Make a couple of base classes:
# class Types::BaseEdge < GraphQL::Types::Relay::BaseEdge; end
# class Types::BaseConnection < GraphQL::Types::Relay::BaseConnection; end
#
# # Then extend them ... | # # Make a couple of base classes:
# class Types::BaseEdge < GraphQL::Types::Relay::BaseEdge; end
# class Types::BaseConnection < GraphQL::Types::Relay::BaseConnection; end
#
# # Then extend them for the object in your app
# class Types::PostEdge < Types::BaseEdge
# ... | <|file_sep|>original/lib/graphql/types/relay/base_connection.rb
# end
#
# # Make a couple of base classes:
# class Types::BaseEdge < GraphQL::Types::Relay::BaseEdge; end
# class Types::BaseConnection < GraphQL::Types::Relay::BaseConnection; end
#
# # Then extend them ... | 66d09a53372f7fd6d7b7ab23c63cf2e5f690b8bc | lib/graphql/types/relay/base_connection.rb | lib/graphql/types/relay/base_connection.rb | Ruby |
<|file_sep|>Unilib/Sources/Strings.swift.diff
original:
updated:
/// Return prefix of dot separated string
<|file_sep|>Unilib/Sources/Strings.swift.diff
original:
updated:
/// Return prefix segments of dot separate string
func dotPrefix(segments:Int = 1) -> String? {
return components(separatedBy:... | /// Return prefix segments of dot separate string
func dotPrefix(segments:Int = 1) -> String? {
return components(separatedBy: ".")
.prefix(segments).nonEmpty?
.joined(separator: ".")
}
/// Return suffix of dot separate string
var dotSuffix:String? {
return co... | <|file_sep|>Unilib/Sources/Strings.swift.diff
original:
updated:
/// Return prefix of dot separated string
<|file_sep|>Unilib/Sources/Strings.swift.diff
original:
updated:
/// Return prefix segments of dot separate string
func dotPrefix(segments:Int = 1) -> String? {
return components(separatedBy:... | 5c432e1574a6acdf707ac2fe0edee0f7d7e37806 | Unilib/Sources/Strings.swift | Unilib/Sources/Strings.swift | Swift |
<|file_sep|>original/dahlem.html
---
layout: overview
image: img/logos/CoderDojoDahlemLogo.png
title: CoderDojo Dahlem
structure:
- id: symbols
structure:
- lightbot
- spritebox
- scratchjr
- id: blocks
structure:
- blockly
- code.org
- id: syntax
structure:
- codecombat
- waterloo
---
<|file_sep|>c... | ---
layout: overview
image: img/logos/CoderDojoDahlemLogo.png
title: CoderDojo Dahlem
structure:
- id: homepage
- id: symbols
structure:
- lightbot
- spritebox
- scratchjr
- id: blocks
structure:
- blockly
- code.org
- id: syntax
structure:
- codecombat
- waterloo
--- | <|file_sep|>original/dahlem.html
---
layout: overview
image: img/logos/CoderDojoDahlemLogo.png
title: CoderDojo Dahlem
structure:
- id: symbols
structure:
- lightbot
- spritebox
- scratchjr
- id: blocks
structure:
- blockly
- code.org
- id: syntax
structure:
- codecombat
- waterloo
---
<|file_sep|>c... | 0e84ecfb4791e42fc61ac3cab1150a6b95c62207 | dahlem.html | dahlem.html | HTML |
<|file_sep|>src/main.rs.diff
original:
extern crate rand;
const N: usize = 3;
updated:
use std::collections::LinkedList;
<|file_sep|>src/main.rs.diff
original:
// TODO: make N a part of the metric holder and use a vector
// also improve by persisting the sum instead of doing avg every time
history: [u32; N... |
self.sum as f64 / self.history.len() as f64
}
fn new(n: usize) -> MetricHolder {
MetricHolder {
n: n,
sum: 0,
history: LinkedList::new()
}
}
}
fn main() {
let mut metric_holder = MetricHolder::new(2);
println!("{}", metric_holder.moving_... | <|file_sep|>src/main.rs.diff
original:
extern crate rand;
const N: usize = 3;
updated:
use std::collections::LinkedList;
<|file_sep|>src/main.rs.diff
original:
// TODO: make N a part of the metric holder and use a vector
// also improve by persisting the sum instead of doing avg every time
history: [u32; N... | 57f7653d7bcb2274a0382c6b7040137ee9f7da04 | src/main.rs | src/main.rs | Rust |
<|file_sep|>original/plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java
<|file_sep|>current/plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java
<|file_sep|>updated/plugins/org.corpus-tools.atomic/src/main/java... | /**
*
*/
package org.corpus_tools.atomic.api.events;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.contexts.IContextActivati... | <|file_sep|>original/plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java
<|file_sep|>current/plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java
<|file_sep|>updated/plugins/org.corpus-tools.atomic/src/main/java... | f62b567672a65a6bfc0792f707bcd0d08cb46555 | plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java | plugins/org.corpus-tools.atomic/src/main/java/org/corpus_tools/atomic/api/events/PartContextListener.java | Java |
<|file_sep|>original/package.json
"test": "gulp test"
},
"repository": {
"type": "git",
"url": "https://github.com/jedcn/coffeelint-prefer-poet-mode"
},
"keywords": [
"coffeelint",
"parens",
"poetry",
"poet-mode"
],
"author": "jedcn",
"license": "MIT",
"bugs": {
"url": "h... | "test": "gulp test"
},
"repository": {
"type": "git",
"url": "https://github.com/jedcn/coffeelint-prefer-poet-mode"
},
"keywords": [
"coffeelint",
"parens",
"poetry",
"poet-mode",
"coffeelintrule"
],
"author": "jedcn",
"license": "MIT",
"bugs": {
"url": "https://githu... | <|file_sep|>original/package.json
"test": "gulp test"
},
"repository": {
"type": "git",
"url": "https://github.com/jedcn/coffeelint-prefer-poet-mode"
},
"keywords": [
"coffeelint",
"parens",
"poetry",
"poet-mode"
],
"author": "jedcn",
"license": "MIT",
"bugs": {
"url": "h... | 82e8b349682f18c2b18955a852e4e4ba0a434f92 | package.json | package.json | JSON |
<|file_sep|>original/install-exif.sh
pushd lib
wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.02.tar.gz
gzip -dc Image-ExifTool-10.02.tar.gz | tar -xf -
pushd Image-ExifTool-10.02
perl Makefile.PL
make test
make install
cp exiftool ../exiftool
cp lib ../lib -r
popd
rm Image-ExifTool-10.02* -rf
<|fi... | #!/bin/bash
pushd lib
wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.02.tar.gz
gzip -dc Image-ExifTool-10.02.tar.gz | tar -xf -
pushd Image-ExifTool-10.02
perl Makefile.PL
make test
make install
cp exiftool ../exiftool
cp lib ../lib -r
popd
rm Image-ExifTool-10.02* -rf | <|file_sep|>original/install-exif.sh
pushd lib
wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.02.tar.gz
gzip -dc Image-ExifTool-10.02.tar.gz | tar -xf -
pushd Image-ExifTool-10.02
perl Makefile.PL
make test
make install
cp exiftool ../exiftool
cp lib ../lib -r
popd
rm Image-ExifTool-10.02* -rf
<|fi... | 8cd8dbb6dee6654ba7e7135e57644e9bf688f531 | install-exif.sh | install-exif.sh | Shell |
<|file_sep|>original/app/assets/javascripts/app/jobs.js.coffee
$ ->
$("#slider").slider
value: 1
min: 1
max: 3
slide: (event, ui) ->
num = ui.value+1
verbosity = while num -= 1 then 'v'
$("#job_verbosity").val verbosity.join('')
if $('#job-results').size() > 0
div = ... | $ ->
$("#slider").slider
value: 3
min: 1
max: 3
slide: (event, ui) ->
num = ui.value+1
verbosity = while num -= 1 then 'v'
$("#job_verbosity").val verbosity.join('')
if $('#job-results').size() > 0
div = $ '#job-results'
project_id = div.data 'project_id'
job... | <|file_sep|>original/app/assets/javascripts/app/jobs.js.coffee
$ ->
$("#slider").slider
value: 1
min: 1
max: 3
slide: (event, ui) ->
num = ui.value+1
verbosity = while num -= 1 then 'v'
$("#job_verbosity").val verbosity.join('')
if $('#job-results').size() > 0
div = ... | ce349d3642f09eeb779e52a83c32fd9770dbc2b5 | app/assets/javascripts/app/jobs.js.coffee | app/assets/javascripts/app/jobs.js.coffee | CoffeeScript |
<|file_sep|>src/app/security/js/security.controller.js.diff
original:
userGroupID: $stateParams.usergroupid || $stateParams.adminusergroupid
updated:
userGroupID: $stateParams.usergroupid || $stateParams.sellerusergroupid
<|file_sep|>original/src/app/security/js/security.controller.js
... | .then(function() {
toastr.success(scope.profile.Name + ' was enabled.');
})
.catch(function(ex) {
scope.profile.selected = false;
$exceptionHandler(ex);
});
} else {
var option... | <|file_sep|>src/app/security/js/security.controller.js.diff
original:
userGroupID: $stateParams.usergroupid || $stateParams.adminusergroupid
updated:
userGroupID: $stateParams.usergroupid || $stateParams.sellerusergroupid
<|file_sep|>original/src/app/security/js/security.controller.js
... | be5a8cbd24b92c7f056f59425cc583b0cdc29709 | src/app/security/js/security.controller.js | src/app/security/js/security.controller.js | JavaScript |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.