Skip to content

Upgrade to GitHub-native Dependabot #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
tmp/**
public/system/**
.idea/**
.byebug_history
pg_data/
.vscode/
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.3.1
ruby-2.4.6
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ addons:
services:
- postgresql
- redis
- elasticsearch
language: ruby
rvm:
- 2.3.1
- 2.4.6
cache: bundler
env:
- RAILS_ENV=test
- SIDEKIQ_SOURCE=https://gems.contribsys.com
before_install:
- curl -O https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.2.1.deb && sudo dpkg -i --force-confnew elasticsearch-1.2.1.deb && sudo service elasticsearch restart
- psql -c 'create database travis_ci_test;' -U postgres
- cp config/database.travis.yml config/database.yml
- git --git-dir=spec/fixtures/repository.git init --bare
- bundle config gems.contribsys.com $BUNDLE_GEMS__CONTRIBSYS__COM
script:
- bundle exec rake db:test:prepare
- bundle exec rake environment elasticsearch:import:model FORCE=y CLASS=Commit
- bundle exec rake environment elasticsearch:import:model FORCE=y CLASS=Key
- bundle exec rake environment elasticsearch:import:model FORCE=y CLASS=Translation
- bundle exec rake chewy:reset
- bundle exec rspec
3 changes: 2 additions & 1 deletion Brewfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
brew 'cmake'
brew 'libarchive'
brew 'libgit2'
brew 'postgresql'
brew 'postgresql@9.4'
brew 'qt'
brew 'redis'
brew '[email protected]'
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
FROM ruby:2.3.1
FROM ruby:2.4.6

ARG BUNDLE_GEMS__CONTRIBSYS__COM
ENV APP_HOME /app
RUN mkdir $APP_HOME
WORKDIR $APP_HOME

COPY square_primary_certificate_authority_g2.crt /usr/local/share/ca-certificates/
COPY square_service_authority_g2.crt /usr/local/share/ca-certificates/
RUN update-ca-certificates

# RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
RUN apt-get update -qq \
&& apt-get install -y build-essential nodejs libarchive-dev libpq-dev \
postgresql-client cmake tidy git \
Expand Down
37 changes: 28 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.3.1'
source 'https://rubygems.org'

ruby '2.4.6'

# FRAMEWORK
gem 'rails', '4.2.10'
Expand All @@ -15,6 +16,7 @@ gem 'rubyzip'

# AUTHENTICATION
gem 'devise'
gem 'devise_security_extension'

# MODELS
gem 'pg', '< 1.0'
Expand All @@ -29,11 +31,8 @@ gem 'after-commit-on-action'
gem 'postgres_ext'
gem 'active_record_union'

# ElASTICSEARCH
gem 'elasticsearch', '< 6.0'
gem 'elasticsearch-rails'
gem 'elasticsearch-model'
gem 'elasticsearch-dsl'
# ELASTICSEARCH
gem 'chewy'

# VIEWS
gem 'jquery-rails'
Expand All @@ -46,8 +45,9 @@ gem 'slim-rails'
gem 'autoprefixer-rails'

# UTILITIES
gem 'bundler'
gem 'json'
gem 'rugged', github: 'brandonweeks/rugged', tag: 'v0.24.0-square0', submodules: true
gem 'rugged', github: 'squarit/rugged', tag: 'v0.27.2-square0', submodules: true
gem 'coffee-script'
gem 'unicode_scanner'
gem 'httparty'
Expand All @@ -59,6 +59,7 @@ gem 'aws-sdk', '< 3'
gem 'execjs'
gem 'safemode'
gem 'pivot_table'
gem 'sentry-raven'

# IMPORTING
gem 'nokogiri'
Expand All @@ -80,9 +81,10 @@ gem 'uea-stemmer'
gem 'faker'

# BACKGROUND JOBS
source "https://gems.contribsys.com/" do
source 'https://gems.contribsys.com' do
gem 'sidekiq-pro', '= 3.4.5'
end

gem 'sidekiq-failures', github: 'mhfs/sidekiq-failures'
gem 'sinatra', require: nil
gem 'whenever', require: nil
Expand All @@ -97,6 +99,14 @@ gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
gem 'hogan_assets', github: 'rubenrails/hogan_assets', branch: 'fix_for_sprockets' # sprockets 3 compatibility
gem 'awesome_print'

source 'https://rails-assets.org' do
gem 'rails-assets-raven-js'
end

# METRICS
gem 'newrelic_rpm'

group :development do
gem 'capistrano'
Expand All @@ -113,6 +123,13 @@ group :development do
gem 'binding_of_caller'
end

group :dummy do
# needed for deployment
gem 'rbnacl', '< 5.0'
gem 'rbnacl-libsodium'
gem 'bcrypt_pbkdf', '< 2.0'
end

group :test do
gem 'rspec-rails'
gem 'factory_bot_rails'
Expand All @@ -121,3 +138,5 @@ group :test do
gem 'database_cleaner'
gem 'capybara'
end

gem "message_format", "~> 0.0.5"
Loading