Skip to content

Commit 4ecb0e4

Browse files
committed
Adds ember tree; Main controller with index action; ember-rails as dependency from git source
Signed-off-by: Akash Manohar J <akash@akash.im>
1 parent 5b3bb04 commit 4ecb0e4

File tree

5 files changed

+16
-241
lines changed

5 files changed

+16
-241
lines changed

Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ group :assets do
2222
gem 'uglifier', '>= 1.0.3'
2323
end
2424

25+
# TODO remove git dependency after development
26+
gem 'ember-rails', :git => "https://github.com/emberjs/ember-rails.git"
2527
gem 'jquery-rails'
2628

2729
gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]

Gemfile.lock

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/emberjs/ember-rails.git
3+
revision: 1614e7dac6dcd83a68b4f5ea479d2fec7094d781
4+
specs:
5+
ember-rails (0.2.4)
6+
execjs (>= 1.2)
7+
railties (>= 3.0)
8+
19
GIT
210
remote: https://github.com/pivotal/jasmine-gem.git
311
revision: 5a7524ae9eaea4fe106a7aaa90ccfb1bc137abe7
@@ -183,6 +191,7 @@ DEPENDENCIES
183191
coffee-rails (~> 3.2.1)
184192
devise
185193
devise_bushido_authenticatable
194+
ember-rails!
186195
factory_girl_rails
187196
jasmine!
188197
jquery-rails

app/assets/javascripts/application.js

+3
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
//
1313
//= require jquery
1414
//= require jquery_ujs
15+
//= require ember-dev
16+
//= require ember
17+
//= require ember/kandan
1518
//= require_tree .

config/routes.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
Kandan::Application.routes.draw do
2+
get "main/index"
3+
24
#devise_for :users
35

46
# The priority is based upon order of creation:

public/index.html

-241
This file was deleted.

0 commit comments

Comments
 (0)