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

Release 1.20.0 #655

Merged
merged 82 commits into from
Nov 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
b1cc32b
db/seeds.rb: Give restroom entries an edit_id (#567)
DeeDeeG Mar 31, 2019
7aaf380
Explain how to run individual tests and access psql (#570)
Apr 3, 2019
be1f773
Make filter with "focus" class more readable
Hkly Apr 25, 2019
207baa4
Remove unused li
Hkly Apr 25, 2019
8a46a26
Allow dropdown menu text to wrap and fit within the dropdown
Hkly Apr 25, 2019
3c406be
Merge pull request #583 from Hkly/filter-focus-color
mi-wood Apr 27, 2019
e1d35b9
Merge pull request #584 from Hkly/word-wrap-dropdown-menu
mi-wood Apr 27, 2019
9b2f321
yarn.lock: Update jquery (#587)
DeeDeeG May 13, 2019
16b9bde
Dockerfile: Update and streamline steps (#586)
DeeDeeG May 27, 2019
c02db62
Dockerfile: Get latest Node.js in a major version (#589)
DeeDeeG Aug 20, 2019
03d8933
Update Node.js and Ruby dependencies (#590)
DeeDeeG Aug 20, 2019
4d722df
Add Bugsnag to readme
tkwidmer Sep 3, 2019
ca942b3
.travis.yml: Use minimal base image for Travis CI
DeeDeeG Aug 20, 2019
4b86b63
docker-compose.yml: Use postgresql:alpine image
DeeDeeG Aug 20, 2019
c6cf8d9
Merge pull request #591 from DeeDeeG/faster-travis-ci
DeeDeeG Sep 22, 2019
9f3f942
layouts/_footer.html.haml: Remove tumblr link
DeeDeeG Aug 21, 2019
384740e
stylesheets/.../common: Remove tumblr icon stlye
DeeDeeG Aug 21, 2019
89f9162
en/footer.en.yml: Remove string for tumblr blog
DeeDeeG Sep 22, 2019
7074c49
Merge pull request #592 from DeeDeeG/remove-tumblr
DeeDeeG Sep 22, 2019
7fd61d3
removed tumblr from about page (#593)
Oct 1, 2019
b7359cc
Create about.fil.yml (#465)
vinzruzell Feb 19, 2018
b80146f
Filipino Translation devise.fil.yml (#454)
vinzruzell Feb 22, 2018
4fc16ae
100% completed for restroom.fil.yml file (#467)
vinzruzell Feb 25, 2018
d4957e1
Translations for EN to FIL Issue 451 (#556)
Dec 17, 2018
d8a4cfe
config/locales/fil/: Remove tumblr
DeeDeeG Oct 5, 2019
3e46d8d
Updated filipino translations
brynmrk Oct 7, 2019
db3e900
switched sass-rails gem (#595)
btyy77c Oct 8, 2019
b941f43
Changed the word `restroom` to `banyo` to be mroe understandable to m…
brynmrk Oct 9, 2019
ef24b4b
Fixed some unnoticed words that needed some changes in translation
brynmrk Oct 11, 2019
8f9e765
additional translation changes
brynmrk Oct 14, 2019
56e5cbc
Merge pull request #596 from brynmrk/updated_filipino_translations
DeeDeeG Oct 14, 2019
96d4dcc
config/application.rb: Add 'fil' locale (Filipino)
DeeDeeG Oct 14, 2019
ac8f6ab
.travis.yml: Set "dist" to "trusty" (#600)
DeeDeeG Oct 25, 2019
9b76d05
config/application.rb: Set default locale to "en"
DeeDeeG Oct 19, 2019
a71013b
production.rb: Fix i18n.fallbacks deprecation warn
DeeDeeG Oct 19, 2019
7378cda
production.rb: I18n fallbacks for :tl --> :fil
DeeDeeG Oct 19, 2019
c4e9d20
config/application.rb: Add Tagalog (:tl) locale
DeeDeeG Oct 19, 2019
15e2e42
Merge pull request #599 from DeeDeeG/i18n-fallbacks
DeeDeeG Oct 26, 2019
17f8762
package.json: Update swagger to master with patch
DeeDeeG Oct 15, 2019
2a56975
yarn.lock: Update all packages
DeeDeeG Oct 15, 2019
701d9df
Gemfile[.lock]: Update devise, simple_form
DeeDeeG Oct 15, 2019
1750825
Merge pull request #597 from DeeDeeG/update-dependencies
DeeDeeG Oct 26, 2019
c388c97
yarn.lock: Upgrade swagger-ui's dependencies
DeeDeeG Oct 26, 2019
792ed5b
Ruby: Upgrade from 2.5.3 to 2.5.7
DeeDeeG Oct 14, 2019
77715cb
Dockerfile: Work around an issue with phantomjs
DeeDeeG Oct 26, 2019
05c74cb
Merge pull request #598 from DeeDeeG/ruby-2.5.7
DeeDeeG Oct 26, 2019
7381796
Merge branch 'master' into develop
tkwidmer Oct 29, 2019
6c96368
Fix Travis tests failing on distributions other than trusty (#606)
stardust66 Nov 1, 2019
5154cd1
Dockerfile: Upgrade Node from v10.x to v12.x (#603)
DeeDeeG Nov 1, 2019
01c3c21
Webpack Upgrade (#607)
btyy77c Dec 21, 2019
c6dc441
PR #607: Minor tweaks/cleanup
DeeDeeG Dec 21, 2019
da6e0e2
CONTRIBUTING.md: Remove the reference to "Cmd + C"
DeeDeeG Dec 21, 2019
297980c
db/schema.rb: Commit with underscores in date
DeeDeeG Dec 24, 2019
3714303
restrooms_spec.rb: Fix a test (#608)
DeeDeeG Dec 24, 2019
89c8355
Update some dependencies, fix some deprecation warnings (#609)
DeeDeeG Jan 5, 2020
61e5df4
Tweak CSS a bit for narrow screens (e.g. mobile phones) (#610)
DeeDeeG Jan 5, 2020
dd5441e
CSS: Center logo and brand name on narrow screens (#611)
DeeDeeG Jan 28, 2020
cc9f2a7
Update docker config (#616)
DeeDeeG Mar 17, 2020
15fe9f7
Ruby: Update from 2.5.7 to 2.5.8 (#618)
DeeDeeG Apr 2, 2020
a3ba4b7
Update Node.JS and Ruby Dependencies (#617)
DeeDeeG Apr 4, 2020
73de17f
Implement Google's reCAPTCHA (#566)
stardust66 Apr 13, 2020
93d5733
Merge branch 'master' into develop
mi-wood Apr 13, 2020
aed3e1e
Add a locale switcher (#620)
DeeDeeG Apr 16, 2020
6b49bca
Revert "Add a locale switcher (#620)"
DeeDeeG Apr 23, 2020
5e1819e
Update dependencies for May 2020 (#622)
DeeDeeG Jun 5, 2020
d5fee11
Add reference to docker troubleshooting wiki in `CONTRIBUTING.md` (#625)
piercebb Jun 23, 2020
6c95b14
Add listeners to close infowindow when another is opened (#628)
piercebb Jun 28, 2020
4edf5dd
CONTRIBUTING.md: Docker for Windows requirements
DeeDeeG Jul 4, 2020
3f68f41
Update dependencies June 2020 (#629)
DeeDeeG Jul 4, 2020
c17d41b
README.md: Update Slack invite link (#631)
DeeDeeG Jul 9, 2020
133346f
yarn.lock: Update elliptic and lodash (#633)
DeeDeeG Aug 13, 2020
66b4fa7
deps: Upgrade @rails/webpacker to v5.x (#634)
DeeDeeG Aug 18, 2020
0285845
Finish Upgrading Webpacker to v5 (#637)
DeeDeeG Sep 23, 2020
2cd6d56
Update dependencies for September 2020 (#636)
DeeDeeG Oct 2, 2020
e49263a
Keeping filters state on pagination (#638)
GPrimola Oct 17, 2020
2535377
Add rubocop and resolve lint errors (#644)
tegandbiscuits Oct 22, 2020
0d97024
Applying ADA filters for the Map view of search. (#651)
GPrimola Oct 26, 2020
82ef4c4
Add a standard EditorConfig configuration for every contributor to fo…
brunoocasali Oct 26, 2020
e69f17f
Enhancement/i18n thread safe (#647)
brunoocasali Oct 29, 2020
f63d71f
Upgrade puma to latest version 5.x (#641)
brunoocasali Oct 29, 2020
fe195d7
yarn.lock: Update "http-proxy" to v1.18.1
DeeDeeG Oct 31, 2020
6ef2fdd
Merge remote-tracking branch 'origin/master' into release-1.20.0
DeeDeeG Oct 31, 2020
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
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{md,markdown}]
trim_trailing_whitespace = false
54 changes: 54 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# The behavior of RuboCop can be controlled via the .rubocop.yml
# configuration file. It makes it possible to enable/disable
# certain cops (checks) and to alter their behavior if they accept
# any parameters. The file can be placed either in your home
# directory or in some project directory.
#
# RuboCop will start looking for the configuration file in the directory
# where the inspected file is and continue its way up to the root directory.
#
# See https://docs.rubocop.org/rubocop/configuration

require:
- rubocop-rails
- rubocop-rspec

AllCops:
NewCops: enable
Exclude:
- 'Gemfile'
- '**/*.rake'
- 'bin/**/*'
- 'config/**/*'
- 'db/**/*'
- 'node_modules/**/*'
- 'vendor/**/*'
- 'tmp/**/*'
- 'Rakefile'
- 'config.rb'
- 'config.ru'

Style/Documentation:
Enabled: false

Style/FrozenStringLiteralComment:
Enabled: false

Style/StringLiterals:
Enabled: false

Metrics/BlockLength:
ExcludedMethods:
- describe
- context
- factory
- define

RSpec/ExampleLength:
Enabled: false

RSpec/MultipleExpectations:
Enabled: false

Style/RegexpLiteral:
AllowInnerSlashes: true
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ before_script:
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
script:
- docker-compose run web rubocop
- docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT --prefix /refugerestrooms
17 changes: 15 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,27 @@ This is equivalent, but slower during a code-test-code-test development cycle:
docker-compose run web rspec spec/models/restroom_spec.rb
```

### 7 Shut down the Docker Container:
### 7 Linting Code
Ruby code is linted with [rubocop](https://docs.rubocop.org/).

If you want to lint your code before pushing it, you can run:
```
docker-compose run web rubocop
```

Some lint issues can be resolved automatically by running:
```
docker-compose run web rubocop --auto-correct
```

### 8 Shut down the Docker Container:
In another terminal window, run:
```
docker-compose down
```
_(Shutting down the container in this way is safer than exiting with `Ctrl + C`, and prevents issues with breaking the `db` container.)_

### 8 Optional tasks:
### 9 Optional tasks:
To clean up encoding problems in the safe2pee data, run (Use `rake db:fix_accents[dry_run]` to preview the changes.):
```
docker-compose run rake db:fixaccents
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '2.5.8'

gem 'rails', '5.2.4.3'
gem 'rails', '5.2.4.4'

gem 'activeadmin', '~> 2.1'
gem 'bootsnap', require: false
Expand Down Expand Up @@ -32,7 +32,7 @@ gem 'simple_form', '~> 5.0'
gem 'sprockets', '< 4'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 4'
gem 'webpacker', '~> 5'

group :development, :test do
gem 'better_errors', '~> 2.4.0'
Expand All @@ -42,6 +42,9 @@ group :development, :test do
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'pry'
gem 'rspec-rails'
gem 'rubocop', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false
end

group :development do
Expand Down
Loading