Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
commit 647b081d9bbe8bb9244d82d62c43aed643b93659 2 parents 9f49fc3 + 9e58963
Rusty Geldmacher authored
View
9 .travis.yml
@@ -0,0 +1,9 @@
+rvm: 1.9.2
+
+before_script:
+ - "cp config/database.example.yml config/database.yml"
+ - "bundle exec rake db:migrate"
+
+notifications:
+ irc: "irc.freenode.org#boston.rb"
+
View
2  README.md
@@ -1,3 +1,5 @@
+# BostonRB [![travis-ci status](https://secure.travis-ci.org/bostonrb/bostonrb.png)](http://travis-ci.org/bostonrb/bostonrb)
+
This is the source code for the Boston Ruby Group's community website:
http://bostonrb.org
View
40 app/views/pages/home.html.erb
@@ -9,10 +9,10 @@
<article>
<header><h2>where</h2></header>
<p>
- <a href="http://maps.google.com/maps?q=355+congress+st+boston+ma+02210">Bocoup</a><br/>
- 355 Congress St 2nd Floor<br/>
- Boston, MA<br/>
- <%= link_to 'Sign up required', 'http://guestlistapp.com/events/80589', :id => 'signup' %>
+ <a href="http://maps.google.com/maps?q=1+memorial+drive+cambridge+ma">Microsoft NERD</a><br/>
+ 1 Memorial Drive<br/>
+ Cambridge, MA 02142<br/>
+ <%= link_to 'Sign up required','http://guestlistapp.com/events/81732', :id => 'signup' %>
</p>
</article>
@@ -37,36 +37,4 @@
</p>
</article>
- <article>
- <header><h2>community values</h2></header>
- <p>
- The Boston Ruby Group is a local community dedicated to creating and
- sharing open source Ruby software. We motivate Rubyists to achieve
- their highest potential by providing free events and materials.
- </p>
-
- <p>
- We encourage attitudes of humility, humor, collaboration, constructive
- criticism, and respect for others.
- </p>
-
- <p>
- We eagerly seek people of every age, gender, race, religion,
- sexuality, ability, and disability to join us.
- </p>
-
- <p>
- We uphold a commitment to diversity by taking action against members
- who demean, belittle, or harm another person or group. Responsibility
- for speaking up lies with each member. We govern ourselves.
- </p>
-
- <p>
- We seek an interesting, fun, and safe environment.
- </p>
-
- <p>
- We care for each other.
- </p>
- </article>
</section>
View
4 spec/models/presentation_spec.rb
@@ -20,10 +20,10 @@
describe '.past_or_by_month' do
before do
- Timecop.freeze(Date.parse('May 10, 2011'))
+ Timecop.freeze(Date.parse('May 20, 2011'))
@past_presentation_1 = Factory(:presentation, :presented_at => 'April 8, 2011')
@past_presentation_2 = Factory(:presentation, :presented_at => 'May 9, 2011')
- @current_presentation = Factory(:presentation, :presented_at => 'May 10, 2011')
+ @current_presentation = Factory(:presentation, :presented_at => 'May 20, 2011')
@future_presentation = Factory(:presentation, :presented_at => 'June 11, 2011')
end
Please sign in to comment.
Something went wrong with that request. Please try again.