diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
deleted file mode 100644
index bc5da28a..00000000
--- a/.github/workflows/ruby.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
- push:
- pull_request:
- branches: [ "main" ]
-
-permissions:
- contents: read
-
-jobs:
- test:
-
- runs-on: ubuntu-latest
- strategy:
- matrix:
- ruby-version: ['3.2']
-
- steps:
- - uses: actions/checkout@v3
- - name: Set up Ruby
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby-version }}
- bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- - name: Run tests
- run: bundle exec rspec
diff --git a/lib/doc_page.rb b/lib/doc_page.rb
index d6dc5629..d1e982cc 100644
--- a/lib/doc_page.rb
+++ b/lib/doc_page.rb
@@ -41,11 +41,7 @@ def file_name
end
def git_url
-<<<<<<< HEAD
- "https://github.com/railsbridge/docs/blob/master/sites/#{site.name}/#{file_name}"
-=======
"https://github.com/railsbridge-boston/docs/blob/master/sites/#{@locale}/#{site.name}/#{file_name}"
->>>>>>> 737f14f (boston chapter specific tweaks to codebase)
end
def src_url
diff --git a/sites/intro-to-rails/img/codespaces5.png b/sites/intro-to-rails/img/codespaces5.png
index e4a4086e..8c3924b3 100644
Binary files a/sites/intro-to-rails/img/codespaces5.png and b/sites/intro-to-rails/img/codespaces5.png differ
diff --git a/sites/intro-to-rails/img/codespaces9.png b/sites/intro-to-rails/img/codespaces9.png
index 0b735404..9ed18a67 100644
Binary files a/sites/intro-to-rails/img/codespaces9.png and b/sites/intro-to-rails/img/codespaces9.png differ
diff --git a/sites/intro-to-rails/intro-to-rails.step b/sites/intro-to-rails/intro-to-rails.step
index 895c5215..fda9d884 100755
--- a/sites/intro-to-rails/intro-to-rails.step
+++ b/sites/intro-to-rails/intro-to-rails.step
@@ -49,7 +49,7 @@ On the next screen, you can click "skip personalization" on the bottom to contin
To do that,
Create a new repository from the Railsbridge template.
You can pick any name you like, or accept the default suggestion. You can also decide if you want your code to be public
- for anyone to see, or private.
Leave the "Include all branches" option unchecked, then click Create repository.
+ for anyone to see, or private.
Click Create repository to continue.
@@ -58,11 +58,12 @@ On the next screen, you can click "skip personalization" on the bottom to contin
When it's finished, you'll be taken to a page that looks like this. Click on the green Code button,
+ make sure you're on the "Codespaces" tab,
then click Create codespace on main. This will be our code editor.
- This will begin setting up the editor in your browser. It may take a minute or two.
+ This will begin setting up the editor in your browser. This usually takes at least 2 - 3 minutes.