Skip to content

Commit 94b7160

Browse files
authored
Merge pull request #1244 from github/github_pages
Port from Rails to Jekyll
2 parents 1a67bb4 + f1a9724 commit 94b7160

File tree

221 files changed

+2799
-7038
lines changed

Some content is hidden

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

221 files changed

+2799
-7038
lines changed

.codecov.yml

-1
This file was deleted.

.github/dependabot.yml

-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
version: 2
22
updates:
3-
- package-ecosystem: bundler
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "10:00"
8-
timezone: Europe/Vienna
9-
pull-request-branch-name:
10-
separator: "-"
11-
open-pull-requests-limit: 99
12-
allow:
13-
- dependency-type: direct
14-
- dependency-type: indirect
15-
rebase-strategy: disabled
163
- package-ecosystem: npm
174
directory: "/"
185
schedule:

.github/workflows/deploy.yml

-61
This file was deleted.

.github/workflows/tests.yml

+3-26
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ name: GitHub Actions CI
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
pull_request:
8-
98
jobs:
109
tests:
1110
runs-on: ubuntu-latest
@@ -16,9 +15,6 @@ jobs:
1615
- name: Set up Ruby
1716
uses: ruby/setup-ruby@v1
1817

19-
- name: Check for correct Ruby version in Gemfile.lock
20-
run: git grep -o " ruby ${{ steps.ruby_version.outputs.RUBY_VERSION }}" HEAD -- Gemfile.lock
21-
2218
- name: Get NodeJS version
2319
run: echo "::set-output name=NODE_VERSION::$(cat .node-version)"
2420
id: node_version
@@ -28,16 +24,10 @@ jobs:
2824
with:
2925
node-version: "${{ steps.node_version.outputs.NODE_VERSION }}"
3026

31-
- name: Set up PostgreSQL
32-
run: |
33-
sudo apt-get install postgresql libpq-dev
34-
sudo service postgresql start
35-
sudo -u postgres createuser --superuser "$USER"
36-
3727
- name: Bootstrap
3828
run: script/bootstrap
3929

40-
- name: Check for uncommitted NodeJS modules
30+
- name: Check for uncommitted or incorrect NodeJS modules
4131
run: |
4232
git diff --stat --exit-code node_modules || {
4333
echo '\n\nError: you must commit all NodeJS modules!'
@@ -48,18 +38,5 @@ jobs:
4838
exit 1
4939
}
5040
51-
- name: Set up Rails
52-
run: script/setup
53-
env:
54-
RAILS_ENV: test
55-
5641
- name: Run tests
57-
run: bundle exec rake test
58-
59-
- name: Run RuboCop
60-
uses: wearerequired/lint-action@v1
61-
with:
62-
auto_fix: true
63-
rubocop: true
64-
rubocop_command_prefix: bundle exec
65-
42+
run: script/test

.gitignore

+4-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
1-
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
2-
#
3-
# If you find yourself ignoring temporary files generated by your text editor
4-
# or operating system, you probably want to add a global ignore instead:
5-
# git config --global core.excludesfile '~/.gitignore_global'
6-
7-
# Ignore macOS thumbnail file
81
.DS_Store
9-
10-
# Ignore bundler config.
11-
/.bundle
12-
13-
# Ignore all logfiles and tempfiles.
14-
/log/*
15-
/tmp/*
16-
!/log/.keep
17-
!/tmp/.keep
18-
19-
# Ignore Byebug command history file.
20-
.byebug_history
21-
22-
# Ignore application configuration
23-
/config/application.yml
24-
25-
# Ignore generated assets
26-
/public/assets/*
27-
28-
# Ignore code coverage output
29-
/coverage/
30-
31-
# Ignore `brew bundle` lock file
2+
.bundle
3+
_site/
324
Brewfile.lock.json
33-
34-
# Ignore npm files
355
node_modules/
6+
Gemfile.lock
7+
.jekyll-metadata

Brewfile

-8
This file was deleted.

CONTRIBUTING.md

+13-20
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,27 @@
22

33
Want to contribute to Open Source Friday? That's great! Here are a couple of guidelines that will help you contribute. Before we get started: Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md) to ensure that this project is a welcoming place for **everyone** to contribute to. By participating in this project you agree to abide by its terms.
44

5-
#### Overview
6-
7-
* [Contribution workflow](#contribution-workflow)
8-
* [Setup instructions](#setup-instructions)
9-
* [Localisation](#localisation)
10-
* [Reporting a bug](#reporting-a-bug)
11-
* [Additional info](#additional-info)
12-
135
## Contribution workflow
146

15-
* Fork the project.
16-
* Make your feature addition or bug fix.
17-
* Add tests for it. This is important so we don't break it in a future version unintentionally.
18-
* Send a pull request. Bonus points for topic branches.
7+
* Fork the project.
8+
* Make your feature addition or bug fix.
9+
* Send a pull request. Bonus points for topic branches.
1910

2011
## Setup instructions
2112

22-
You can find in-depth instructions to install the correct Ruby version, Postgres, and to set up the database in our [README](README.md#getting-started).
13+
You can find instructions to get setup in our [README](README.md#getting-started).
2314

2415
## Translation
2516

26-
* Fork the project.
27-
* Clone your fork to your machine.
28-
* Create a new branch for your translation work.
29-
* Copy `config/locales/en.yml` to target locale file e.g. `config/locales/es.yml`.
30-
* Add target language in `config/initializers/locale.rb`:`I18n.available_locales = %i[en, ja]`
31-
* Translate messages in new locale file.
32-
* Send a pull request.
17+
* Fork the project.
18+
* Clone your fork to your machine.
19+
* Create a new branch for your translation work.
20+
* Copy `_data/locales/en.yml` to target locale file e.g. `_data/locales/es.yml`.
21+
* Create a new folder in the repository root e.g. `es/`.
22+
* Copy `businesses.html`, `index.html` and `maintainers.html` from the repository root into the new folder e.g. `es/businesses.html` etc.
23+
* Edit the `lang: en` to be the correct language in the new `businesses.html`, `index.html` and `maintainers.html` files e.g. `lang: es`
24+
* Translate messages in new locale file and use `script/server` to verify they are displayed correctly.
25+
* Send a pull request.
3326

3427
## Reporting a bug
3528

Gemfile

+3-46
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,8 @@
11
source "https://rubygems.org"
22

3-
ruby File.read(
4-
File.expand_path("#{File.dirname(__FILE__)}/.ruby-version")
5-
).strip
6-
7-
# Include https://github.com/heartcombo/devise/pull/5327 for OmniAuth 2
8-
gem "devise"
9-
gem "devise-i18n"
10-
gem "faraday-http-cache"
11-
gem "figaro"
12-
gem "jquery-rails"
13-
gem "octicons_helper"
14-
gem "octokit"
15-
gem "omniauth-github"
16-
gem "omniauth-rails_csrf_protection"
17-
gem "pg"
18-
gem "puma"
19-
gem "rack-host-redirect"
20-
gem "rails", "~> 7.0"
21-
gem "rtl"
22-
gem "sassc-rails"
23-
gem "sitemap_generator"
24-
gem "turbolinks"
25-
gem "uglifier"
26-
27-
group :development, :test do
28-
gem "byebug"
29-
end
30-
31-
group :development do
32-
gem "listen"
33-
gem "rubocop"
34-
gem "rubocop-performance"
35-
gem "rubocop-rails"
36-
gem "spring"
37-
gem "web-console"
38-
end
39-
40-
group :production do
41-
gem "connection_pool"
42-
gem "dalli"
43-
gem "kgio"
44-
gem "memcachier"
45-
gem "rack-cache"
46-
end
3+
gem "github-pages", group: :jekyll_plugins
474

485
group :test do
49-
gem "simplecov", require: false
50-
gem "vcr", require: false
6+
gem "html-proofer"
7+
gem "rake"
518
end

0 commit comments

Comments
 (0)