Skip to content

Commit a3122e7

Browse files
committed
Merge branch 'develop' of https://github.com/Vizzuality/gfw into fix/forest-change-analysis
2 parents 903651f + 9e6a3bb commit a3122e7

File tree

397 files changed

+3960
-5974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+3960
-5974
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/cypress/integration

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ vendor/assets/bower_components
3737
jstest/SpecRunner.html
3838
yarn.lock
3939
package-lock.json
40+
/cypress/videos
41+
/cypress/screenshots
4042

4143
# Ignore Vagrant
4244
.vagrant

.travis.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
language: ruby
2+
3+
node_js:
4+
- 8.10.0
5+
6+
rvm:
7+
- 2.4.0
8+
9+
cache:
10+
bundler: true
11+
directories:
12+
- ~/.npm
13+
- node_modules
14+
15+
install:
16+
- bundle install && npm install
17+
18+
script:
19+
- npm run ci

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ gem 'fog'
1818
gem 'rmagick', :require => false
1919
gem 'mini_magick'
2020
gem 'unf'
21+
gem 'sitemap_generator'
2122

2223
# requirejs
2324
gem 'erubis'
@@ -38,7 +39,7 @@ gem 'nokogiri', '~> 1.8.2'
3839
group :development, :test do
3940
gem 'rspec-rails', '~> 3.5.2'
4041
gem 'show_me_the_cookies'
41-
gem 'factory_girl_rails'
42+
gem 'factory_bot_rails'
4243
gem 'shoulda-matchers'
4344
gem 'database_cleaner'
4445
gem 'byebug'

Gemfile.lock

+7-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ GEM
117117
ffi (>= 1.3.0)
118118
excon (0.61.0)
119119
execjs (2.7.0)
120-
factory_girl (4.9.0)
120+
factory_bot (4.8.2)
121121
activesupport (>= 3.0.0)
122-
factory_girl_rails (4.9.0)
123-
factory_girl (~> 4.9.0)
122+
factory_bot_rails (4.8.2)
123+
factory_bot (~> 4.8.2)
124124
railties (>= 3.0.0)
125125
ffi (1.9.23)
126126
fission (0.5.0)
@@ -415,6 +415,8 @@ GEM
415415
json (>= 1.8, < 3)
416416
simplecov-html (~> 0.10.0)
417417
simplecov-html (0.10.2)
418+
sitemap_generator (6.0.1)
419+
builder (~> 3.0)
418420
spring (2.0.2)
419421
activesupport (>= 4.2)
420422
sprockets (3.7.1)
@@ -474,7 +476,7 @@ DEPENDENCIES
474476
database_cleaner
475477
dotenv-rails
476478
erubis
477-
factory_girl_rails
479+
factory_bot_rails
478480
fog
479481
foreman
480482
httparty
@@ -495,6 +497,7 @@ DEPENDENCIES
495497
shoulda-matchers
496498
show_me_the_cookies
497499
simplecov
500+
sitemap_generator
498501
spring
499502
sprockets-rails (= 2.3.3)
500503
typhoeus

README.md

+4-7
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)