diff options
| author | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
| commit | 8f100d3c03a6f554e703c5d0b2fe221958424c26 (patch) | |
| tree | 77e90f53d05fecefa91adf89a3c35f19e277996b /test/dummy/app | |
| parent | f77301824c42bdd4559a0b0e58b8f3c26f239643 (diff) | |
| parent | f5aea5347601c3500bb3670971d44995c35c3c7b (diff) | |
Merge branch 'release-0.1.0' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'test/dummy/app')
| -rw-r--r-- | test/dummy/app/assets/javascripts/application.js | 16 | ||||
| -rw-r--r-- | test/dummy/app/controllers/application_controller.rb | 3 | ||||
| -rw-r--r-- | test/dummy/app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | test/dummy/app/mailers/.gitkeep | 0 | ||||
| -rw-r--r-- | test/dummy/app/models/.gitkeep | 0 | ||||
| -rw-r--r-- | test/dummy/app/views/layouts/application.html.erb | 14 |
6 files changed, 35 insertions, 0 deletions
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js new file mode 100644 index 0000000..b3ce228 --- /dev/null +++ b/test/dummy/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD +// GO AFTER THE REQUIRES BELOW. +// +//= require jquery +//= require jquery_ujs +//= require_tree . +//= require srp diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb new file mode 100644 index 0000000..e8065d9 --- /dev/null +++ b/test/dummy/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery +end diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/test/dummy/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/test/dummy/app/mailers/.gitkeep b/test/dummy/app/mailers/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/dummy/app/mailers/.gitkeep diff --git a/test/dummy/app/models/.gitkeep b/test/dummy/app/models/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/dummy/app/models/.gitkeep diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb new file mode 100644 index 0000000..4cab268 --- /dev/null +++ b/test/dummy/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html> +<head> + <title>Dummy</title> + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> +</head> +<body> + +<%= yield %> + +</body> +</html> |