[ARVADOS] updated: 283dbf37a1b7d32332e295070de48b5e6e459248
git at public.curoverse.com
git at public.curoverse.com
Wed Apr 9 17:05:24 EDT 2014
Summary of changes:
sdk/cli/bin/crunch-job | 1 +
services/api/Gemfile | 2 ++
services/api/Gemfile.lock | 3 +++
.../api/app/controllers/application_controller.rb | 7 +++++++
services/api/app/models/user.rb | 14 ++++++++------
services/api/config/application.default.yml | 2 ++
services/api/config/database.yml.sample | 4 ++--
services/api/config/routes.rb | 2 ++
services/api/test/fixtures/jobs.yml | 2 ++
services/api/test/unit/user_test.rb | 10 ++++++++--
10 files changed, 37 insertions(+), 10 deletions(-)
via 283dbf37a1b7d32332e295070de48b5e6e459248 (commit)
via b16daa6053ebc15d306c29c01a2134f420e3dab1 (commit)
via 9c40a72521dbfb4244d48069e4754a342f800492 (commit)
via e35ed29187d83ebd4cbc493b9251119013825ac1 (commit)
via e9ee7a48d3f95d41f5b17d4c1c5c65471ff0b598 (commit)
via 71b0d0fb51e3c54a7959f51fd4dbf523fbaf57db (commit)
via 6ea2e62b70a015226c4f3361ab3591509100a820 (commit)
via e4b0ff638bb41ce55ab3770c4f2b7f744d653aac (commit)
via 50ee9817061629f9ffe2568f937149f6e877df04 (commit)
via 7488683807205fdfebd3c52e6ba50a0879ef1da7 (commit)
via 351718c4524ede8442f1cc078d61ced8839440c5 (commit)
via 0c632a2429105322f793809f1ab5bb158050ed56 (commit)
via da1c3891473b02f891eaa0af3d9d799ec6b6ed54 (commit)
via 6783336d968c8e47ad63e929086aa704299bb403 (commit)
via 3dd13d1a0643fdcc9e4f391b74b2496ca2ebbc7c (commit)
via dcbdaf47dd1486f58893413c07a9cb5c6d180923 (commit)
via c7b2768cd590b633fe4154dedec2d8ad387a9d9b (commit)
via a0d41ce990cf0a6fcd516a6a10f662a85258238c (commit)
via 19d60097652447fe7c71ec78f5c8d52a7002b3b8 (commit)
via 4c179135909d37a6cd9722af909785393d9e117d (commit)
via 64d449da29bbbe6bce2b54a2ed67eb4cb44243c9 (commit)
via c7f17227456c27d71bca83895c84bc83fb3b4ec5 (commit)
via 2908852ef9d52b12eb715474c5f31e35f7c44b18 (commit)
via 11a9f64426c1fc50529e694fead97f81e6eb4457 (commit)
via e9339eb1983e33798270f61f57d90cde4b656bd8 (commit)
via 8ea149362539b3d50e14a7fbd8831c7cbf347446 (commit)
via 847b4a5d6e179dde49295a7118962e764d63e544 (commit)
via 1d6d51202a936a28eee2384ceaa7c725813a2b03 (commit)
via d0dc31b9feb56c026f7c7ae0d46e63434b46742f (commit)
via a6724f72c5a93edf2b8a456783a474024743f1ff (commit)
via cbdb5dc18ccbd8cd2cdc4ebeaace82aa33b36f70 (commit)
via 1418580063cbe02ab3376adb27928c5325ba10b3 (commit)
via a3212e71057712af58a7d2b849d69915b4fd79b1 (commit)
via 59b0a3a8e5209ef85967a93c500167b7cf882757 (commit)
via 9349484f1e607064cf96fa7f7212979d30e58448 (commit)
from 04581ab4e5cea0389be8e641a1123381f0f7217c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 283dbf37a1b7d32332e295070de48b5e6e459248
Merge: 9c40a72 b16daa6
Author: radhika chippada <radhika at curoverse.com>
Date: Wed Apr 9 17:03:54 2014 -0400
Merge branch 'master' into 1776-setup-user-email
commit b16daa6053ebc15d306c29c01a2134f420e3dab1
Merge: e9ee7a4 e35ed29
Author: radhika chippada <radhika at curoverse.com>
Date: Wed Apr 9 17:01:44 2014 -0400
Merge branch 'master' of git.curoverse.com:arvados
commit 9c40a72521dbfb4244d48069e4754a342f800492
Author: radhika chippada <radhika at curoverse.com>
Date: Wed Apr 9 17:00:28 2014 -0400
Story 1776: Add theme to api server similar to workbench. Updated files: Gemfile, app/controllers/application_controller.rb, config/application.default.yml, config/routes.rb
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 5932778..cbe2c41 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -63,4 +63,6 @@ gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
+gem 'themes_for_rails'
+
gem 'arvados-cli', '>= 0.1.20140328152103'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 39718bd..460c58e 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -177,6 +177,8 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.8)
test_after_commit (0.2.2)
+ themes_for_rails (0.5.1)
+ rails (>= 3.0.0)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
@@ -214,6 +216,7 @@ DEPENDENCIES
sass-rails (>= 3.2.0)
sqlite3
test_after_commit
+ themes_for_rails
therubyracer
trollop
uglifier (>= 1.0.3)
diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 06e1838..227a488 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -1,5 +1,6 @@
class ApplicationController < ActionController::Base
include CurrentApiClient
+ include ThemesForRails::ActionController
respond_to :json
protect_from_forgery
@@ -20,6 +21,8 @@ class ApplicationController < ActionController::Base
:render_error,
:render_not_found]
+ theme :select_theme
+
attr_accessor :resource_attrs
def index
@@ -477,4 +480,8 @@ class ApplicationController < ActionController::Base
end
super *opts
end
+
+ def select_theme
+ return Rails.configuration.arvados_theme
+ end
end
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 1de4db1..37bb1c3 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -110,3 +110,5 @@ common:
# Version of your assets, change this if you want to expire all your assets
assets.version: "1.0"
+
+ arvados_theme: default
diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 4bc5de8..211701a 100644
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -1,4 +1,6 @@
Server::Application.routes.draw do
+ themes_for_rails
+
resources :humans
resources :traits
resources :repositories
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list