Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix initilize not calling super #4

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix initilize not calling super #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e664a3b
Fix initilize not calling super
enyachoke Jul 28, 2015
32c7217
Fix admission,add quite_assets and better_errors
enyachoke Jul 29, 2015
96708de
Fix Firsttime login change passord
enyachoke Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions .rvmrc
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ gem 'ransack'
# gem 'debugger', group: [:development, :test]

gem 'wicked_pdf'
gem 'wkhtmltopdf-binary'
gem 'declarative_authorization'
gem 'ruby_parser'
gem "iconv", "~> 1.0.3"
Expand All @@ -62,6 +63,8 @@ gem 'annotate', '~> 2.6.6'
group :development do
gem 'pry'
gem 'spring'
gem "better_errors"
gem 'quiet_assets'
end

group :test do
Expand Down
10 changes: 10 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ GEM
activerecord (>= 3.2, <= 4.3)
rake (~> 10.4)
arel (6.0.0)
better_errors (2.0.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
builder (3.2.2)
capybara (2.4.4)
mime-types (>= 1.16)
Expand Down Expand Up @@ -136,6 +140,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.6.0)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -240,6 +246,7 @@ GEM
wicked_pdf (0.11.0)
rails
will_paginate (3.0.7)
wkhtmltopdf-binary (0.9.9.3)
xpath (2.0.0)
nokogiri (~> 1.3)

Expand All @@ -248,6 +255,7 @@ PLATFORMS

DEPENDENCIES
annotate (~> 2.6.6)
better_errors
capybara
capybara-webkit
ckeditor
Expand All @@ -266,6 +274,7 @@ DEPENDENCIES
parallel_tests
pg
pry
quiet_assets
rails (= 4.2)
ransack
responders (~> 2.0)
Expand All @@ -281,3 +290,4 @@ DEPENDENCIES
uglifier (>= 1.3.0)
wicked_pdf
will_paginate
wkhtmltopdf-binary
1 change: 1 addition & 0 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def block_unauthorised_entry

def initialize
@title = FedenaSetting.company_details[:company_name]
super
end

def message_user
Expand Down
Loading