Skip to content

Commit 08512cc

Browse files
author
Mathew Hartley
committed
Remove turbolinks and jbuilder
1 parent b65169f commit 08512cc

11 files changed

Lines changed: 31 additions & 13 deletions

File tree

Gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ gem 'coffee-rails', '~> 4.0.0'
1616

1717
# Use jquery as the JavaScript library
1818
gem 'jquery-rails'
19-
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
20-
gem 'turbolinks'
21-
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
22-
gem 'jbuilder', '~> 2.0'
19+
2320
# bundle exec rake doc:rails generates the API under doc/api.
2421
gem 'sdoc', '~> 0.4.0', group: :doc
2522

Gemfile.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ GEM
4040
execjs (2.2.0)
4141
hike (1.2.3)
4242
i18n (0.6.9)
43-
jbuilder (2.1.1)
44-
activesupport (>= 3.0.0, < 5)
45-
multi_json (~> 1.2)
4643
jquery-rails (3.1.0)
4744
railties (>= 3.0, < 5.0)
4845
thor (>= 0.14, < 2.0)
@@ -101,8 +98,6 @@ GEM
10198
treetop (1.4.15)
10299
polyglot
103100
polyglot (>= 0.3.1)
104-
turbolinks (2.2.2)
105-
coffee-rails
106101
tzinfo (1.2.1)
107102
thread_safe (~> 0.1)
108103
uglifier (2.5.1)
@@ -114,12 +109,10 @@ PLATFORMS
114109

115110
DEPENDENCIES
116111
coffee-rails (~> 4.0.0)
117-
jbuilder (~> 2.0)
118112
jquery-rails
119113
rails (= 4.1.1)
120114
sass-rails (~> 4.0.3)
121115
sdoc (~> 0.4.0)
122116
spring
123117
sqlite3
124-
turbolinks
125118
uglifier (>= 1.3.0)

app/assets/javascripts/application.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
//
1313
//= require jquery
1414
//= require jquery_ujs
15-
//= require turbolinks
1615
//= require_tree .
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Place all the behaviors and hooks related to the matching controller here.
2+
# All this logic will automatically be available in application.js.
3+
# You can use CoffeeScript in this file: http://coffeescript.org/
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Place all the styles related to the welcome controller here.
2+
// They will automatically be included in application.css.
3+
// You can use Sass (SCSS) here: http://sass-lang.com/
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
class WelcomeController < ApplicationController
2+
def index
3+
end
4+
end

app/helpers/welcome_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
module WelcomeHelper
2+
end

app/views/welcome/index.html.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h1>Welcome#index</h1>
2+
<p>Find me in app/views/welcome/index.html.erb</p>

config/routes.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
Rails.application.routes.draw do
2+
get 'welcome/index'
3+
24
# The priority is based upon order of creation: first created -> highest priority.
35
# See how all your routes lay out with "rake routes".
46

57
# You can have the root of your site routed with "root"
6-
# root 'welcome#index'
8+
root 'welcome#index'
79

810
# Example of regular route:
911
# get 'products/:id' => 'catalog#view'
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
require 'test_helper'
2+
3+
class WelcomeControllerTest < ActionController::TestCase
4+
test "should get index" do
5+
get :index
6+
assert_response :success
7+
end
8+
9+
end

0 commit comments

Comments
 (0)