Skip to content

Commit

Permalink
Merge pull request #563 from Data-Liberation-Front/getting-up-to-date
Browse files Browse the repository at this point in the history
Getting up to date
  • Loading branch information
Floppy committed Nov 11, 2020
2 parents 860c122 + 42bd276 commit 0ce26ef
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 160 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Contributing to CSVlint

CSVlint is open source, and contributions are gratefully accepted!
Details on how to contribute are below. By participating in this project, you agree to abide by our [Code of Conduct](https://github.com/theodi/csvlint/blob/CODE_OF_CONDUCT.md).
Details on how to contribute are below. By participating in this project, you agree to abide by our [Code of Conduct](https://github.com/Data-Liberation-Front/csvlint/blob/CODE_OF_CONDUCT.md).

Before you start coding on an issue, please reach out to us either on our [gitter channel](https://gitter.im/theodi/toolbox) or leave a comment on the issue ticket you are interested in contributing towards to indicate your interest in helping.

If this is your first time contributing to the ODI’s codebase you will need to [create a fork of this repository](https://help.github.com/articles/fork-a-repo/).

Consult our [Getting Started Guide](https://github.com/theodi/toolbox/wiki/Developers-Guide:-Getting-Started) (if necessary) and then follow the [readme instructions](https://github.com/theodi/csvlint/blob/master/README.md#development) to get your Development environment running locally
Consult our [Getting Started Guide](https://github.com/Data-Liberation-Front/toolbox/wiki/Developers-Guide:-Getting-Started) (if necessary) and then follow the [readme instructions](https://github.com/Data-Liberation-Front/csvlint/blob/master/README.md#development) to get your Development environment running locally

Ensure that the [tests](https://github.com/theodi/csvlint/blob/master/README.md#tests) pass before working on your contribution
Ensure that the [tests](https://github.com/Data-Liberation-Front/csvlint/blob/master/README.md#tests) pass before working on your contribution

## Code Review Process

Expand Down
88 changes: 44 additions & 44 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
ruby '2.4.10'
ruby '~> 2.4'

gem 'rake', '~> 13.0'
gem 'rails', '~> 4.2'
gem 'dotenv-rails'
gem 'dotenv-rails', '~> 2.7'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0'
Expand All @@ -15,52 +15,52 @@ gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
gem 'therubyracer', '~> 0.12', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-rails', '~> 4.4'

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
gem 'turbolinks', '~> 5.2'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.9'

gem 'sdoc', '~> 1.1', group: :doc

gem 'foreman'
gem 'foreman', '~> 0.87'

group :production do
gem 'thin'
gem 'rails_12factor'
gem 'puma'
gem 'thin', '~> 1.7'
gem 'rails_12factor', '~> 0.0'
gem 'puma', '~> 5.0'
end

group :development, :test do
gem 'rspec-rails', "< 4" # version 4 requires rails 5
gem 'cucumber-rails', require: false
gem 'database_cleaner'
gem 'coveralls', require: false
gem 'cucumber-rails', '~> 1.4', require: false
gem 'database_cleaner', '~> 1.8'
gem 'coveralls', '~> 0.8', require: false
gem 'simplecov', '~> 0.16'
gem 'guard-rspec'
gem 'guard-cucumber'
gem 'guard-bundler'
gem 'webmock', require: false
gem 'pry'
gem 'timecop'
gem 'factory_bot_rails'
gem 'faker'
gem 'poltergeist'
gem 'vcr'
gem 'cucumber-api-steps', require: false, git: 'https://github.com/theodi/cucumber-api-steps.git', branch: 'feature-test-content-type'
gem 'guard-rspec', '~> 4.7'
gem 'guard-cucumber', '~> 1.5'
gem 'guard-bundler', '~> 2.2'
gem 'webmock', '~> 3.9', require: false
gem 'pry', '~> 0.13'
gem 'timecop', '~> 0.9'
gem 'factory_bot_rails', '~> 5.2'
gem 'faker', '~> 2.2'
gem 'poltergeist', '~> 1.6'
gem 'vcr', '~> 6.0'
gem 'cucumber-api-steps', require: false, git: 'https://github.com/Data-Liberation-Front/cucumber-api-steps.git', branch: 'feature-test-content-type'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'sqlite3', '~> 1.4'
end

group :development do
gem 'travis'
gem 'travis', '~> 1.8'
gem 'web-console', '~> 3.3'
gem 'spring'
gem 'spring', '~> 2.1'
end

# Use ActiveModel has_secure_password
Expand All @@ -73,31 +73,31 @@ end
# gem 'capistrano', group: :development

gem 'bootstrap-sass', '~> 3.4'
gem 'rack-google-analytics'
gem 'rack-google-analytics', '~> 1.2'
gem 'mongoid', '~> 5.1'
gem 'kaminari-mongoid'
gem 'kaminari-mongoid', '~> 1.0'
gem 'bson', '~> 3.2'
gem 'mongoid-grid_fs', '~> 2.4'
gem 'bson_ext'
gem 'kaminari'
gem 'bootstrap-kaminari-views'
gem 'data_kitten', git: 'https://github.com/theodi/data_kitten.git', ref: "e343510bd15e3329c1f2fab35035e248195348be", require: false
gem 'rubyzip'
gem 'bson_ext', '~> 1.5'
gem 'kaminari', '~> 1.2'
gem 'bootstrap-kaminari-views', '~> 0.0'
gem 'data_kitten', git: 'https://github.com/Data-Liberation-Front/data_kitten.git', ref: "e343510bd15e3329c1f2fab35035e248195348be", require: false
gem 'rubyzip', '~> 2.3'

gem 'csvlint', '~> 0.4'
gem 'datapackage', '0.0.4' # temporarily pinned to avoid breaking the build
gem 'rest-client'
gem 'rest-client', '~> 2.0'

gem 'nokogiri', '~> 1.10'

gem 'airbrake'
gem 'font-awesome-rails'
gem 'airbrake', '~> 11.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'sidekiq', '~> 4.2'
gem 'data_uri'
gem 'jquery-dotdotdot-rails'
gem 'alternate_rails', git: 'https://github.com/theodi/alternate-rails.git', ref: 'v4.2.0'
gem 'rack-cors'

gem 'resumable_upload', git: 'https://github.com/theodi/resumable-upload'
gem 'pusher'
gem 'cloudflare'
gem 'data_uri', '~> 0.1'
gem 'jquery-dotdotdot-rails', '~> 1.6'
gem 'alternate_rails', git: 'https://github.com/Data-Liberation-Front/alternate-rails.git', ref: 'v4.2.0'
gem 'rack-cors', '~> 1.0'

gem 'resumable_upload', git: 'https://github.com/Data-Liberation-Front/resumable-upload'
gem 'pusher', '~> 1.4'
gem 'cloudflare', '~> 2.1'

0 comments on commit 0ce26ef

Please sign in to comment.