Replace require_relative with compatible version
This commit is contained in:
parent
c6f5b4ed16
commit
ba058a39a8
7 changed files with 8 additions and 16 deletions
|
|
@ -107,7 +107,6 @@ GEM
|
|||
net-sftp (>= 2.0.0)
|
||||
net-ssh (>= 2.0.14)
|
||||
net-ssh-gateway (>= 1.0.0)
|
||||
columnize (0.3.1)
|
||||
crack (0.1.8)
|
||||
daemons (1.1.0)
|
||||
database_cleaner (0.5.2)
|
||||
|
|
@ -127,7 +126,6 @@ GEM
|
|||
highline (1.6.1)
|
||||
i18n (0.4.1)
|
||||
json (1.4.6)
|
||||
linecache (0.43)
|
||||
lsof (0.3.0)
|
||||
mail (2.2.6.1)
|
||||
activesupport (>= 2.3.6)
|
||||
|
|
@ -190,11 +188,6 @@ GEM
|
|||
rspec-rails (2.0.0.beta.17)
|
||||
rspec (>= 2.0.0.beta.14)
|
||||
webrat (>= 0.7.0)
|
||||
ruby-debug (0.10.3)
|
||||
columnize (>= 0.1)
|
||||
ruby-debug-base (~> 0.10.3.0)
|
||||
ruby-debug-base (0.10.3)
|
||||
linecache (>= 0.3)
|
||||
saucelabs-adapter (0.8.12)
|
||||
lsof (>= 0.3.0)
|
||||
net-ssh (>= 2.0.12)
|
||||
|
|
@ -253,7 +246,6 @@ DEPENDENCIES
|
|||
roxml!
|
||||
rspec (>= 2.0.0.beta.17)
|
||||
rspec-rails (= 2.0.0.beta.17)
|
||||
ruby-debug
|
||||
saucelabs-adapter (= 0.8.12)
|
||||
selenium-rc
|
||||
sprinkle!
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
class Profile
|
||||
include MongoMapper::EmbeddedDocument
|
||||
require_relative '../../lib/diaspora/webhooks'
|
||||
require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
|
||||
include Diaspora::Webhooks
|
||||
include ROXML
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
# the COPYRIGHT file.
|
||||
|
||||
|
||||
require_relative '../../lib/diaspora/user/friending.rb'
|
||||
require_relative '../../lib/diaspora/user/querying.rb'
|
||||
require_relative '../../lib/salmon/salmon'
|
||||
require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
|
||||
require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
|
||||
require File.expand_path('../../../lib/salmon/salmon', __FILE__)
|
||||
|
||||
class User
|
||||
include MongoMapper::Document
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ require "active_resource/railtie"
|
|||
# you've limited to :test, :development, or :production.
|
||||
Bundler.require(:default, Rails.env) if defined?(Bundler)
|
||||
|
||||
require_relative '../lib/mongo_mapper/bson_id'
|
||||
require File.expand_path('../../lib/mongo_mapper/bson_id', __FILE__)
|
||||
module Diaspora
|
||||
class Application < Rails::Application
|
||||
# Settings in config/environments/* take precedence over those specified here.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
|
||||
# Load the rails application
|
||||
require_relative 'application'
|
||||
require File.expand_path('../application', __FILE__)
|
||||
Haml::Template.options[:format] = :html5
|
||||
# Initialize the rails application
|
||||
Diaspora::Application.initialize!
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# the COPYRIGHT file.
|
||||
|
||||
|
||||
require_relative '../../lib/mongo_mapper/clear_dev_memory'
|
||||
require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
|
||||
Diaspora::Application.configure do
|
||||
# Settings specified here will take precedence over those in config/environment.rb
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
require 'em-websocket'
|
||||
require 'eventmachine'
|
||||
require_relative "../../lib/diaspora/websocket"
|
||||
require File.expand_path("../../../lib/diaspora/websocket", __FILE__)
|
||||
EM.next_tick {
|
||||
Diaspora::WebSocket.initialize_channels
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue