Skip to content
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

Switch to yarn #677

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
20c81a2
ActiveSupport::Testing::Performance extracted to a gem
cesswairimu May 5, 2019
d4131fd
ruby prof required as a dependency
cesswairimu May 5, 2019
9c21952
Configurations update for rails 4.0
cesswairimu May 5, 2019
c4a3cba
disable rubocop on bin folder
cesswairimu May 5, 2019
58b80a1
http patch
cesswairimu May 5, 2019
76d6e33
Comment out to allow testing
cesswairimu May 5, 2019
3d7d8ba
no longer supports plugin loading
cesswairimu May 5, 2019
8b2eaaf
lock to sprockets 2.12
cesswairimu May 5, 2019
ddb6d7c
Active record patches
cesswairimu May 5, 2019
a79930a
remove deprecated test syntax
cesswairimu May 6, 2019
a1d0aaf
fix failing tests
cesswairimu May 7, 2019
7cb7a4d
change new super class
cesswairimu May 7, 2019
2ef8715
replace right_aws with right_aws_api
cesswairimu May 9, 2019
fc838a8
lock to rails 4.2.11.1
cesswairimu May 14, 2019
b5b6340
change rails version in install script
cesswairimu May 14, 2019
6dc3a69
remove deprecation warnings
cesswairimu May 14, 2019
06f4d00
make app work
cesswairimu May 14, 2019
4db8646
Change test lib to minitest, add minitest reporters
cesswairimu May 11, 2019
6ddb5bc
active record find patches
cesswairimu May 15, 2019
4f31616
root_in_json include defaulted to false
cesswairimu May 16, 2019
76e078a
confirm option removed in link helper
cesswairimu May 16, 2019
5d613e8
cookies serializer changed to hybrid
cesswairimu May 16, 2019
80e12b7
Change render :text to :plain
cesswairimu May 16, 2019
01d86fa
console for dev web
cesswairimu May 16, 2019
db6c5fa
Check and fix interface functionality
cesswairimu May 18, 2019
290273f
fix export functionality
cesswairimu May 21, 2019
36c9208
add protected attributes for the warpable model
cesswairimu May 28, 2019
c53bf27
fix image upload
cesswairimu May 31, 2019
2f23252
Fix comments and images failing tests
cesswairimu Jun 1, 2019
0f76698
include mass assignment security in annotations
cesswairimu Jun 4, 2019
de27727
render html for update images
cesswairimu Jun 4, 2019
685143c
clear mail array before every test
cesswairimu Jun 4, 2019
74a9ecb
Fix codeclimate issues
cesswairimu Jun 5, 2019
daac614
skip failing test
cesswairimu Jun 7, 2019
528ec09
replace unprotected redirects
cesswairimu Jun 7, 2019
1d220ec
Fix codeclimate issues
cesswairimu Jun 5, 2019
5bb19c2
Autofixing rubocop offenses and Problematic test for #578 (#667)
alaxalves Jun 6, 2019
11dd71f
change post test to create since action new is a get action
cesswairimu Jun 7, 2019
fbb29ba
remove unprotected redirects
cesswairimu Jun 7, 2019
bba8fad
Fix codeclimate issues
cesswairimu Jun 7, 2019
6bc9a8c
Add yarn
kaustubh-nair Jun 10, 2019
116f385
Remove error log
kaustubh-nair Jun 10, 2019
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
17 changes: 9 additions & 8 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
version: 2
plugins:
rubocop:
plugins:
rubocop:
enabled: true
channel: rubocop-0-70
brakeman:
brakeman:
enabled: true
bundler-audit:
bundler-audit:
enabled: true
duplication:
duplication:
enabled: true
config:
languages:
- ruby:
- javascript:
eslint:
eslint:
enabled: true
fixme:
fixme:
enabled: true
rubocop:
rubocop:
enabled: true

exclude_patterns:
- config/
- db/
- vendor/
- log/
- bin/


3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ todo.txt
.sass-cache
.byebug_history
coverage_report/
test/reports/
yarn-error.log

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ env:
- TASK="CI=true TRAVIS=true rake test:integration"
- TASK="CI=true TRAVIS=true rake test:functional"
- TASK="CI=true TRAVIS=true rake assets:precompile"
- TASK="CI=true TRAVIS=true bundle exec rubocop"

script:
- docker-compose -f docker-compose.test.yml exec web bash -lc "$TASK"
Expand All @@ -34,4 +35,5 @@ branches:
only:
- main
- unstable
- development

1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--install.modules-folder "./public/lib"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update -qq && apt-get install -y \
COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml

RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y npm
RUN npm install -g bower
RUN npm install -g yarn

# Install bundle of gems
SHELL [ "/bin/bash", "-l", "-c" ]
Expand Down
15 changes: 11 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
source "https://rubygems.org"

ruby "2.4.6"
gem "rails", "~>3.2"
ruby '2.4.6'
gem 'rails', '4.2.11.1'
gem 'rake', '~> 12.3.2'
gem 'skylight'

gem "will_paginate", "3.1.7"
gem 'will_paginate-bootstrap4'
gem "friendly_id"
gem 'popper_js', '~> 1.11', '>= 1.11.1'
gem 'protected_attributes'

# dependencies
group :dependencies do
Expand All @@ -26,7 +27,9 @@ group :dependencies do
gem 'aws-sdk', '~> 1.5.7'

# for rake image migration tasks
gem 'right_aws'
# gem 'right_aws'
gem 'right_aws_api'


# compiling markdown to html
gem "rdiscount", "2.2.0.1"
Expand All @@ -41,9 +44,12 @@ end

group :test do
gem "rubocop", '~> 0.52.0'
gem 'ruby-prof'
gem 'rails-perftest'
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'test-unit'
gem 'minitest'
gem 'minitest-reporters'
end

group :development, :test do
Expand All @@ -55,6 +61,7 @@ end
group :development do
gem "jshintrb"
gem "therubyracer"
gem 'web-console', '~> 2.0'
end

group :sqlite do
Expand Down
Loading