Skip to content

Commit

Permalink
Spell GitHub correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
amatsuda committed Feb 10, 2020
1 parent 7b4fbfe commit 9c49bb4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ This will boot up using Foreman and allow the .env file to be read / set for use

### Environment variables

[Omniauth](https://github.com/omniauth/omniauth) is set up to use Twitter and Github for logins in production. You'll want to put your own key and secret in for both. Other environment variables will include your postgres user and Rails' secret\_token.
[Omniauth](https://github.com/omniauth/omniauth) is set up to use Twitter and GitHub for logins in production. You'll want to put your own key and secret in for both. Other environment variables will include your postgres user and Rails' secret\_token.

TIMEZONE (defaults to Pacific if not set)
POSTGRES_USER (dev/test only)
Expand Down Expand Up @@ -143,7 +143,7 @@ If you have Organizer access you will see an 'Organize' dropdown will give you t

The 'Notifications' dropdown will display a count of any in app notifications you haven't read. Clicking the dropdown will show you a list of these notifications such as 'Marty Haught has commented on <talk title>'. You have a 'Mark all as read' and 'View all notifications' options as well.

We briefly touched on the user dropdown on the far right. This is visible to all users. From there they can sign out or visit their profile. Their profile is how they edit their name, email or bio, allow them to connect to various services such as Github or Twitter. If you are an admin, you will also have a Users link. This is where you manage all User records.
We briefly touched on the user dropdown on the far right. This is visible to all users. From there they can sign out or visit their profile. Their profile is how they edit their name, email or bio, allow them to connect to various services such as GitHub or Twitter. If you are an admin, you will also have a Users link. This is where you manage all User records.

### Submitting a Proposal

Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/shared/_links.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<% end %>
<%= link_to user_github_omniauth_authorize_path, class: "btn btn-github" do %>
<i class="icon-github"></i>
Sign in with Github
Sign in with GitHub
<% end %>

<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/current_styleguide.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
Pinterest
%button.btn.btn-default.btn-github-alt
%i.fa.fa-github
Github
GitHub
/ /controls
/ /form-group
%br/
Expand Down
4 changes: 2 additions & 2 deletions spec/features/receive_speaker_invitation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
known_user.uid = OmniAuth.config.mock_auth[:github][:uid]
known_user.save

click_link "Sign in with Github"
click_link "Sign in with GitHub"
expect(page).to have_content("You have accepted your invitation!")
end

Expand Down Expand Up @@ -101,7 +101,7 @@

it "can use a github oauth account" do
click_link "Sign up"
click_link "Sign in with Github"
click_link "Sign in with GitHub"
expect(page).to have_content("You have accepted your invitation!")
end

Expand Down
4 changes: 2 additions & 2 deletions spec/features/staff/teammate_invitation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
known_user.uid = OmniAuth.config.mock_auth[:github][:uid]
known_user.save

click_link "Sign in with Github"
click_link "Sign in with GitHub"
expect(page).to have_content("Congrats! You are now an official team member of My Event!")
end

Expand Down Expand Up @@ -71,7 +71,7 @@

it "can use a github oauth account" do
click_link "Sign up"
click_link "Sign in with Github"
click_link "Sign in with GitHub"
expect(page).to have_content("Congrats! You are now an official team member of My Event!")
end

Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery.mentionsInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
}

// This is taken straight from live (as of Sep 2012) GitHub code. The
// technique is known around the web. Just google it. Github's is quite
// technique is known around the web. Just google it. GitHub's is quite
// succint though. NOTE: relies on selectionEnd, which as far as IE is concerned,
// it'll only work on 9+. Good news is nothing will happen if the browser
// doesn't support it.
Expand Down

0 comments on commit 9c49bb4

Please sign in to comment.