Skip to content

Commit 1304c18

Browse files
committed
remove all deps on hamburg
1 parent c8e1a1e commit 1304c18

16 files changed

+18
-21
lines changed

.rvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rvm use ruby-1.9.3-p125@hamburg_on_ruby --install --create
1+
rvm use ruby-1.9.3-p125@on_ruby --install --create

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
before_install: gem install bundler --pre
1+
before_install: "gem install bundler --pre"
22
script: "bundle exec rake travis:build"
33
bundler_args: "--without development production"
44
rvm:

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
require File.expand_path('../config/application', __FILE__)
66
require "rake"
77

8-
HamburgOnRuby::Application.load_tasks
8+
OnRuby::Application.load_tasks

app/helpers/application_helper.rb

+2-5
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,12 @@ def twitter_update_url(text)
5454

5555
def likes
5656
content_tag :span, class: 'likes' do
57-
raw <<-HERE
58-
<g:plusone size="medium"></g:plusone>
59-
<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="hamburgsync" data-lang="de">Tweet</a>
60-
HERE
57+
raw %Q(<g:plusone size="medium"></g:plusone><a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="#{Whitelabel[:twitter]}" data-lang="de">Tweet</a>)
6158
end
6259
end
6360

6461
def fork_me_ribbon
65-
target = "https://github.com/phoet/hamburg_on_ruby"
62+
target = "https://github.com/phoet/on_ruby"
6663
img = "https://a248.e.akamai.net/camo.github.com/4c7dc970b89fd04b81c8e221ba88ff99a06c6b61/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67"
6764
link_to target do
6865
image_tag img, alt: "Fork me on GitHub", style: "position: fixed; top: 0; right: 0; border: 0; margin-top: 40px"

app/views/shared/_footer.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#links.block
88
%h2= t("footer.links")
99
%ul
10-
%li= link_to 'Github', 'http://github.com/phoet/hamburg_on_ruby'
10+
%li= link_to 'Github', 'http://github.com/phoet/on_ruby'
1111
%li= link_to 'Mailinglist', 'http://mailman.headflash.com/listinfo/rubyonrails-ug'
1212
#imprint.block
1313
%h2= t("footer.imprint")

app/views/usergroup_mailer/invitation_mail.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<li><%= topic.name %></li>
1212
<% end %>
1313
</ul>
14-
<p>Mehr Informationen findet ihr auf <%= link_to("hamburg.onruby.de", event_url(@event)) %>.</p>
14+
<p>Mehr Informationen findet ihr auf <%= link_to("onruby.de", event_url(@event)) %>.</p>
1515
<p>Bis bald!</p>
1616
</body>
1717
</html>

config.ru

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# This file is used by Rack-based servers to start the application.
22

33
require ::File.expand_path('../config/environment', __FILE__)
4-
run HamburgOnRuby::Application
4+
run OnRuby::Application

config/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Bundler.require(*Rails.groups(:assets)) if defined?(Bundler)
66

7-
module HamburgOnRuby
7+
module OnRuby
88
class Application < Rails::Application
99
# Settings in config/environments/* take precedence over those specified here.
1010
# Application configuration should go into files in config/initializers

config/environment.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
require File.expand_path('../application', __FILE__)
33

44
# Initialize the rails application
5-
HamburgOnRuby::Application.initialize!
5+
OnRuby::Application.initialize!

config/environments/development.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HamburgOnRuby::Application.configure do
1+
OnRuby::Application.configure do
22
# Settings specified here will take precedence over those in config/application.rb
33

44
# In the development environment your application's code is reloaded on

config/environments/production.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HamburgOnRuby::Application.configure do
1+
OnRuby::Application.configure do
22
# Settings specified here will take precedence over those in config/application.rb
33

44
# Code is not reloaded between requests

config/environments/test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HamburgOnRuby::Application.configure do
1+
OnRuby::Application.configure do
22
# Settings specified here will take precedence over those in config/application.rb
33

44
# The test environment is used exclusively to run your application's

config/initializers/secret_token.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# If you change this key, all old signed cookies will become invalid!
55
# Make sure the secret is at least 30 characters and all random,
66
# no regular words or you'll be exposed to dictionary attacks.
7-
HamburgOnRuby::Application.config.secret_token = ENV['SECRET_TOKEN']
7+
OnRuby::Application.config.secret_token = ENV['SECRET_TOKEN']

config/initializers/session_store.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# you need to specifiy the domain to allow cookies to be shared between subdomains.
33
# http://stackoverflow.com/a/10403338/279024 [dh, 2012-05-13]
44
domain = Rails.env.production? ? "onruby.de" : "onruby.dev"
5-
HamburgOnRuby::Application.config.session_store :cookie_store, key: "_on_ruby_session", domain: domain
5+
OnRuby::Application.config.session_store :cookie_store, key: "_on_ruby_session", domain: domain
66

77

88
# Use the database for sessions instead of the cookie-based default,
99
# which shouldn't be used to store highly confidential information
1010
# (create the session table with "rails generate session_migration")
11-
# HamburgOnRuby::Application.config.session_store :active_record_store
11+
# OnRuby::Application.config.session_store :active_record_store

config/routes.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HamburgOnRuby::Application.routes.draw do
1+
OnRuby::Application.routes.draw do
22

33
devise_for :users, ActiveAdmin::Devise.config
44

readme.textile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
h1. OnRuby "!http://travis-ci.org/phoet/hamburg_on_ruby.png!":https://secure.travis-ci.org/phoet/hamburg_on_ruby.png
1+
h1. OnRuby "!http://travis-ci.org/phoet/on_ruby.png!":https://secure.travis-ci.org/phoet/on_ruby.png
22

33
Source for the Sites of the Ruby Communities of "Hamburg":http://hamburg.onruby.de, "Bremen":http://bremen.onruby.de and "Cologne":http://cologne.onruby.de
44

0 commit comments

Comments
 (0)