[ARVADOS] updated: eb7dde727b22ff92f9c63f4e4ac704a7fba97249
git at public.curoverse.com
git at public.curoverse.com
Thu Jan 15 13:16:40 EST 2015
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 4 ++--
apps/workbench/app/controllers/application_controller.rb | 5 ++++-
sdk/ruby/lib/arvados/keep.rb | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
via eb7dde727b22ff92f9c63f4e4ac704a7fba97249 (commit)
via c66671061105e9569e4ddcc9fe50efc171951ee7 (commit)
via 51835046f9dce64c06329c43ca2042b6a7574b5e (commit)
from cd4f50633b256fdf38ae749e6f00ace10c7d45c0 (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 eb7dde727b22ff92f9c63f4e4ac704a7fba97249
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Jan 15 12:50:11 2015 -0500
3021: Do not show user notifications on error pages.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 8f78da6..2dd9b6e 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -45,6 +45,9 @@ class ApplicationController < ActionController::Base
end
def render_error(opts={})
+ # Helpers can rely on the presence of @errors to know they're
+ # being used in an error page.
+ @errors ||= []
opts[:status] ||= 500
respond_to do |f|
# json must come before html here, so it gets used as the
@@ -665,7 +668,7 @@ class ApplicationController < ActionController::Base
helper_method :user_notifications
def user_notifications
- return [] unless current_user.andand.is_active
+ return [] if @errors or not current_user.andand.is_active
@notifications ||= @@notification_tests.map do |t|
t.call(self, current_user)
end.compact
commit c66671061105e9569e4ddcc9fe50efc171951ee7
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Jan 15 12:42:59 2015 -0500
3021: Update Gemfile for Ruby SDK bugfix.
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index eb38380..1cb3252 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
-gem 'arvados', '>= 0.1.20150111195521'
+gem 'arvados', '>= 0.1.20150115165920'
gem 'sqlite3'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index c72f256..d599fc2 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
andand (1.3.3)
angularjs-rails (1.3.8)
arel (5.0.1.20140414130214)
- arvados (0.1.20150111195521)
+ arvados (0.1.20150115165920)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
@@ -258,7 +258,7 @@ DEPENDENCIES
RedCloth
andand
angularjs-rails
- arvados (>= 0.1.20150111195521)
+ arvados (>= 0.1.20150115165920)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
commit 51835046f9dce64c06329c43ca2042b6a7574b5e
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Jan 15 11:59:20 2015 -0500
3021: Remove reference to deleted speclist arg.
diff --git a/sdk/ruby/lib/arvados/keep.rb b/sdk/ruby/lib/arvados/keep.rb
index d966727..f28cfdc 100644
--- a/sdk/ruby/lib/arvados/keep.rb
+++ b/sdk/ruby/lib/arvados/keep.rb
@@ -142,7 +142,7 @@ module Keep
end
def each_file_spec
- return to_enum(__method__, speclist) unless block_given?
+ return to_enum(__method__) unless block_given?
@text.each_line do |line|
stream_name = nil
in_file_tokens = false
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list