Skip to content

Commit

Permalink
Merge pull request #165 from jonallured/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
anandaroop authored Oct 24, 2018
2 parents 35a1e5e + ba21ead commit 4183193
Show file tree
Hide file tree
Showing 11 changed files with 1,608 additions and 112 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
build:
working_directory: ~/rosalind
docker:
- image: artsy/ruby:2.5.1-node-chrome
- image: artsy/ruby:2.5.3-node-chrome
environment:
RAILS_ENV: test
- image: circleci/postgres:10.1-alpine
Expand All @@ -27,7 +27,6 @@ jobs:

- run: bundle exec rubocop --rails
- run: yarn run lint
- run: chromedriver-update 2.38
- run: bundle exec rspec
- run: yarn run test -- --runInBand

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.1
2.5.3
1 change: 1 addition & 0 deletions Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def warn_if_adding(term:, files:)
files.each do |file|
diff = git.diff_for_file(file)
next unless diff

added_lines = diff.patch.split(/\n/).select { |line| line =~ /^\+/ }
warn "Please think twice before adding #{term} to the project 😱 (#{file})" if added_lines.any? { |line| line =~ regexp }
end
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

ruby File.read('.ruby-version')

gem 'rails', '5.2.0'
gem 'pg'
gem 'puma'
gem 'rails', '5.2.1'

kinetic_gem_spec = { git: 'https://github.com/artsy/kinetic.git', branch: 'master' }
# kinetic_gem_spec = { path: '../kinetic' }
Expand Down
Loading

0 comments on commit 4183193

Please sign in to comment.