diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/services/QuillLMS/config/initializers/session_store.rb b/services/QuillLMS/config/initializers/session_store.rb
index abc1234..def5678 100644
--- a/services/QuillLMS/config/initializers/session_store.rb
+++ b/services/QuillLMS/config/initializers/session_store.rb
@@ -6,5 +6,5 @@ elsif Rails.env.staging?
EmpiricalGrammar::Application.config.session_store :cookie_store, key: '_quill_staging_session', domain: 'staging.quill.org'
else
- EmpiricalGrammar::Application.config.session_store :cookie_store, key: '_quill_session'
+ EmpiricalGrammar::Application.config.session_store :cookie_store, key: '_quill_development_session', domain: :all
end
|
Allow all domains for cookies in development env
|
diff --git a/app/models/sprint.rb b/app/models/sprint.rb
index abc1234..def5678 100644
--- a/app/models/sprint.rb
+++ b/app/models/sprint.rb
@@ -3,9 +3,11 @@
validate :no_weekend_day
- scope :current, (-> { find_by('start_date <= :today AND end_date >= :today', today: Time.zone.today) })
+ after_create :create_meetings
- after_create :create_meetings
+ def self.current
+ find_by('start_date <= :today AND end_date >= :today', today: Time.zone.today)
+ end
private
|
Move current to a class method
as it will return [] instead of nil if there is not current sprint
otherwise.
|
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -6,7 +6,7 @@ end
def index
- transactions = Transaction.with_matcher
+ transactions = Transaction.with_matcher.order(:posted_at)
transactions = transactions.from_date @from if @from
transactions = transactions.to_date @to if @to
|
Order transactions by posted date
|
diff --git a/app/uploaders/ckeditor_picture_uploader.rb b/app/uploaders/ckeditor_picture_uploader.rb
index abc1234..def5678 100644
--- a/app/uploaders/ckeditor_picture_uploader.rb
+++ b/app/uploaders/ckeditor_picture_uploader.rb
@@ -28,7 +28,7 @@ # # do something
# end
- process :read_dimensions
+ process :extract_dimensions
# Create different versions of your uploaded files:
version :thumb do
|
Fix the ckeditor breaking changes.
|
diff --git a/app/views/user_profiles/show.json.jbuilder b/app/views/user_profiles/show.json.jbuilder
index abc1234..def5678 100644
--- a/app/views/user_profiles/show.json.jbuilder
+++ b/app/views/user_profiles/show.json.jbuilder
@@ -4,5 +4,5 @@ json.call(@user, :username, :profile_image)
json.bio @user.user_profile&.bio
json.location @user.user_profile&.location
- json.instution @user.user_profile&.institution
+ json.institution @user.user_profile&.institution
end
|
Fix typo in UserProfiles JSON
|
diff --git a/lib/que/adapters/active_record.rb b/lib/que/adapters/active_record.rb
index abc1234..def5678 100644
--- a/lib/que/adapters/active_record.rb
+++ b/lib/que/adapters/active_record.rb
@@ -2,16 +2,13 @@ module Adapters
class ActiveRecord < Base
def checkout
- ::ActiveRecord::Base.connection_pool.with_connection do |conn|
- @conn = conn
- yield @conn.raw_connection
- end
+ checkout_activerecord_adapter { |conn| yield conn.raw_connection }
end
def wake_worker_after_commit
# Works with ActiveRecord 3.2 and 4 (possibly earlier, didn't check)
- if @conn.raw_connection.transaction_status != PGconn::PQTRANS_IDLE
- @conn.add_transaction_record(CommittedCallback.new)
+ if in_transaction?
+ checkout_activerecord_adapter { |adapter| adapter.add_transaction_record(CommittedCallback.new) }
else
Que.wake!
end
@@ -21,13 +18,17 @@ def has_transactional_callbacks?
true
end
- def logger
- Logger.new(STDOUT) # for debugging
- end
+
def committed!
Que.wake!
end
end
+
+ private
+
+ def checkout_activerecord_adapter(&block)
+ ::ActiveRecord::Base.connection_pool.with_connection(&block)
+ end
end
end
end
|
Make ActiveRecord worker wakeups thread-safe.
|
diff --git a/lib/sunat/models/tax_sub_total.rb b/lib/sunat/models/tax_sub_total.rb
index abc1234..def5678 100644
--- a/lib/sunat/models/tax_sub_total.rb
+++ b/lib/sunat/models/tax_sub_total.rb
@@ -7,7 +7,7 @@ property :tax_category, TaxCategory
def build_xml(xml)
- xml['cac'].TaxSubTotal do
+ xml['cac'].TaxSubtotal do
tax_amount.build_xml xml, :TaxAmount
tax_category.build_xml(xml) if tax_category
end
|
Fix to set the right tag.
|
diff --git a/spec/acceptance/10_basic_ironic_spec.rb b/spec/acceptance/10_basic_ironic_spec.rb
index abc1234..def5678 100644
--- a/spec/acceptance/10_basic_ironic_spec.rb
+++ b/spec/acceptance/10_basic_ironic_spec.rb
@@ -11,6 +11,7 @@ include openstack_integration::apache
include openstack_integration::rabbitmq
include openstack_integration::mysql
+ include openstack_integration::memcached
include openstack_integration::keystone
include openstack_integration::ironic
EOS
|
Enable memcached in acceptance tests
... because it is required as cache backend.
Change-Id: I1da59bacb6dfba7fe439d0c94e12f9968c5f501e
|
diff --git a/spec/lib/statistics/aggregation_spec.rb b/spec/lib/statistics/aggregation_spec.rb
index abc1234..def5678 100644
--- a/spec/lib/statistics/aggregation_spec.rb
+++ b/spec/lib/statistics/aggregation_spec.rb
@@ -6,14 +6,10 @@
before(:all) do
Dojo.delete_all
- DojoEventService.delete_all
- EventHistory.delete_all
end
after do
Dojo.delete_all
- DojoEventService.delete_all
- EventHistory.delete_all
end
describe '.run' do
|
Remove delete_all for models that depend Dojo in spec
|
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,8 +1,8 @@ class SearchController < ApplicationController
def index
scope = Project.search(params[:q])
- scope = scope.platform(params[:platform]) if params[:platform].present?
- scope = scope.license(params[:license]) if params[:license].present?
+ # scope = scope.platform(params[:platform]) if params[:platform].present?
+ # scope = scope.license(params[:license]) if params[:license].present?
@licenses = Project.popular_licenses.limit(20)
@platforms = Download.platforms.map{|p| p.to_s.demodulize }
|
Disable search filters for now
|
diff --git a/app/controllers/twilio_controller.rb b/app/controllers/twilio_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/twilio_controller.rb
+++ b/app/controllers/twilio_controller.rb
@@ -1,5 +1,18 @@ class TwilioController < ApplicationController
def new_message
-
+ body = JSON.decode(request.body)
+
+ @message = TwilioMessage.create({
+ :message_sid => body['MessageSid'],
+ :account_sid => body['AccountSid'],
+ :messaging_service_sid => body['MessagingServiceSid'],
+ :from => body['From'],
+ :to => body['To'],
+ :body => body['Body'],
+ :num_media => body['NumMedia'],
+ :media_content_type => body['MediaContentType'],
+ :media_url => body['MediaUrl']
+ })
+ Rails.logger.debug(@message.to_json)
end
end
|
Create new record for new messages
|
diff --git a/app/services/notify_about_comment.rb b/app/services/notify_about_comment.rb
index abc1234..def5678 100644
--- a/app/services/notify_about_comment.rb
+++ b/app/services/notify_about_comment.rb
@@ -13,8 +13,8 @@ private
def notify(comment)
- users = comment.post.comments.map(&:user)
- users << comment.post.author
+ users = comment.subject.comments.map(&:user)
+ users << comment.subject.author
users = users.uniq.reject { |user| user == current_user }
users.each do |user|
CommentMailer.notify_user(user, comment).deliver
|
Use subject in comment notifier
|
diff --git a/event_store-messaging.gemspec b/event_store-messaging.gemspec
index abc1234..def5678 100644
--- a/event_store-messaging.gemspec
+++ b/event_store-messaging.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
s.name = 'event_store-messaging'
s.summary = 'Messaging primitives for EventStore using the EventStore Client HTTP library'
- s.version = '0.1.5'
+ s.version = '0.1.6'
s.authors = ['']
s.require_paths = ['lib']
s.files = Dir.glob('{lib}/**/*')
|
Package version is increased from 0.1.5 to 0.1.6
|
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index abc1234..def5678 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,6 +1,8 @@ ENV['RAILS_ENV'] ||= 'test'
require 'simplecov'
-SimpleCov.start 'rails'
+SimpleCov.start 'rails' do
+ add_filter '/lib/shopping/version'
+end
require File.expand_path("../dummy/config/environment.rb", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
|
Exclude version file from simplecov
|
diff --git a/cookbooks/delivery_rust/recipes/publish.rb b/cookbooks/delivery_rust/recipes/publish.rb
index abc1234..def5678 100644
--- a/cookbooks/delivery_rust/recipes/publish.rb
+++ b/cookbooks/delivery_rust/recipes/publish.rb
@@ -1,6 +1,6 @@ omnibus_path = File.join(node['delivery_builder']['repo'], 'omnibus-delivery-cli')
-execute "bundle install --binstubs=#{omnibus_path}/bin" do
+execute "bundle install --binstubs=#{omnibus_path}/bin --path=#{File.join(node['delivery_builder']['cache'], 'gems')}" do
cwd omnibus_path
end
|
Use a path for the bundle install
|
diff --git a/features/support/helpers/login_helper.rb b/features/support/helpers/login_helper.rb
index abc1234..def5678 100644
--- a/features/support/helpers/login_helper.rb
+++ b/features/support/helpers/login_helper.rb
@@ -0,0 +1,63 @@+module RoomsFeatures
+ module LoginHelper
+ def omniauth_hash
+ hash = OmniAuth::AuthHash.new(provider: :nyulibraries, uid: 'dev123')
+ hash.info = omniauth_info
+ hash.extra = omniauth_extra
+ hash
+ end
+
+ def non_aleph_omniauth_hash
+ hash = OmniAuth::AuthHash.new(provider: :nyulibraries, uid: 'dev123')
+ hash.info = omniauth_info
+ hash.extra = OmniAuth::AuthHash.new(
+ {
+ provider: 'nyu_shibboleth',
+ identities: [nyu_shibboleth_identity],
+ institution: 'NYU'
+ }
+ )
+ hash
+ end
+
+ def omniauth_info
+ hash = OmniAuth::AuthHash.new(
+ {
+ name: 'Dev Eloper',
+ nickname: 'Dev',
+ email: 'dev.eloper@nyu.edu',
+ first_name: 'Dev',
+ last_name: 'Eloper'
+ }
+ )
+ end
+
+ def omniauth_extra
+ OmniAuth::AuthHash.new(
+ {
+ provider: 'nyu_shibboleth',
+ identities: identities,
+ institution: 'NYU'
+ }
+ )
+ end
+
+ def identities
+ [nyu_shibboleth_identity, aleph_identity]
+ end
+
+ def nyu_shibboleth_identity
+ {provider: 'nyu_shibboleth', uid: 'dev123'}
+ end
+
+ def aleph_identity
+ {
+ provider: 'aleph',
+ uid: (ENV['BOR_ID'] || 'BOR_ID'),
+ properties: {
+ patron_status: '51'
+ }
+ }
+ end
+ end
+end
|
Add some helpers for login steps
|
diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb
index abc1234..def5678 100644
--- a/features/steps/shared/user.rb
+++ b/features/steps/shared/user.rb
@@ -20,10 +20,10 @@ end
step 'I have an ssh key' do
- create(:key, user: @user, title: "An ssh-key", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+L3TbFegm3k8QjejSwemk4HhlRh+DuN679Pc5ckqE/MPhVtE/+kZQDYCTB284GiT2aIoGzmZ8ee9TkaoejAsBwlA+Wz2Q3vhz65X6sMgalRwpdJx8kSEUYV8ZPV3MZvPo8KdNg993o4jL6G36GDW4BPIyO6FPZhfsawdf6liVD0Xo5kibIK7B9VoE178cdLQtLpS2YolRwf5yy6XR6hbbBGQR+6xrGOdP16eGZDb1CE2bMvvJijjloFqPscGktWOqW+nfh5txwFfBzlfARDTBsS8WZtg3Yoj1kn33kPsWRlgHfNutFRAIynDuDdQzQq8tTtVwm+Yi75RfcPHW8y3P Work")
+ create(:personal_key, user: @user)
end
step 'I have no ssh keys' do
- Key.delete_all
+ @user.keys.delete_all
end
end
|
Simplify shared User SSH key steps
|
diff --git a/db/migrate/20160707083854_create_agents.rb b/db/migrate/20160707083854_create_agents.rb
index abc1234..def5678 100644
--- a/db/migrate/20160707083854_create_agents.rb
+++ b/db/migrate/20160707083854_create_agents.rb
@@ -1,5 +1,7 @@ class CreateAgents < ActiveRecord::Migration
def up
+ drop_table :agents if ActiveRecord::Base.connection.table_exists? :agents
+
create_table :agents do |t|
t.string :first_name
t.string :last_name
|
Remove old table called agents if it exists
|
diff --git a/gem/test/yank_command_test.rb b/gem/test/yank_command_test.rb
index abc1234..def5678 100644
--- a/gem/test/yank_command_test.rb
+++ b/gem/test/yank_command_test.rb
@@ -5,7 +5,7 @@ setup do
@gem = "MyGem"
@version = '0.1.0'
- @api = "https://rubygems.org/api/v1/gems/#{@gem}/yank"
+ @api = "https://rubygems.org/api/v1/gems/yank"
@command = Gem::Commands::YankCommand.new
stub(@command).say
end
|
Use all data endpoint in gem test
|
diff --git a/app/models/competitions/grand_prix_brad_ross/overall.rb b/app/models/competitions/grand_prix_brad_ross/overall.rb
index abc1234..def5678 100644
--- a/app/models/competitions/grand_prix_brad_ross/overall.rb
+++ b/app/models/competitions/grand_prix_brad_ross/overall.rb
@@ -8,11 +8,11 @@ before_create :set_name
def minimum_events
- 5
+ 4
end
def maximum_events(_race)
- 6
+ 4
end
def upgrade_points_multiplier
|
Update Grand Prix Carl Decker min and max events
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,7 +22,7 @@ if request.env["HTTP_USER_AGENT"] and !request.env["HTTP_USER_AGENT"].include?("facebookexternalhit/1.1")
redirect_to proc { url_for(params.except(:ref)) }
end
- elsif request.fullpath != "admin" || !cookies[:h_ref]
+ elsif request.fullpath != "/admin" || cookies[:h_ref].blank?
redirect_to "http://ultimate-bundles.com/healthy-living-bundle-2014/"
end
end
|
Add code to end campaign and redirect users who come to the site
|
diff --git a/app/controllers/healthcheck_controller.rb b/app/controllers/healthcheck_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/healthcheck_controller.rb
+++ b/app/controllers/healthcheck_controller.rb
@@ -1,11 +1,6 @@ class HealthcheckController < ActionController::Base
- # rescue_from ApiEntity::Error do |e|
- # render text: '', status: :error
- # end
-
def check
- # Check API connectivity
- # Section.all
+ User.first # test db connectivity
render json: { git_sha1: CURRENT_RELEASE_SHA }
end
end
|
Fix Healthcheck action, check for db connectivity
|
diff --git a/app/controllers/identifiers_controller.rb b/app/controllers/identifiers_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/identifiers_controller.rb
+++ b/app/controllers/identifiers_controller.rb
@@ -2,7 +2,7 @@ def doi
@doi = 'doi: ' + params[:identifiers].downcase
@doi_condensed = 'doi:' + params[:identifiers].downcase
- @paper = Paper.where('identifier = ? OR identifier = ?', @doi, @doi_condensed).first
+ @paper = Paper.where('lower(identifier) = ? OR lower(identifier) = ?', @doi, @doi_condensed).first
unless @paper
metadata = PaperMetadata.metadata_for(@doi)
unless metadata[:status] == :NODOI
@@ -17,7 +17,7 @@
def arxiv
@arxiv = "arXiv: " + params[:identifiers].downcase
- @paper = Paper.find_by_identifier(@arxiv)
+ @paper = Paper.where('lower(identifier) = ?', @arxiv).first
unless @paper
metadata = PaperMetadata.metadata_for(@arxiv)
unless metadata.blank?
|
Fix bug that was creating duplicates of papers with different-cased identifiers
|
diff --git a/app/serializers/api/partner_serializer.rb b/app/serializers/api/partner_serializer.rb
index abc1234..def5678 100644
--- a/app/serializers/api/partner_serializer.rb
+++ b/app/serializers/api/partner_serializer.rb
@@ -1,11 +1,15 @@ class Api::PartnerSerializer < ActiveModel::Serializer
- attributes :id, :name, :description, :url, :logo, :white_logo, :logo_medium,
+ attributes :id, :name, :description, :url, :logo, :white_logo, :logo_large, :logo_medium,
:white_logo_medium, :logo_size, :contact_name, :contact_email
def logo_size
dimensions = (object.logo_dimensions || '0x0').split('x')
{ width: dimensions[0].to_i, height: dimensions[1].to_i}
+ end
+
+ def logo_large
+ object.logo.url(:large)
end
def logo_medium
|
Add logo large in partner serialize
|
diff --git a/tops_connect.gemspec b/tops_connect.gemspec
index abc1234..def5678 100644
--- a/tops_connect.gemspec
+++ b/tops_connect.gemspec
@@ -22,7 +22,7 @@ spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
- spec.add_development_dependency 'bundler', '~> 1.16'
+ spec.add_development_dependency 'bundler', '~> 2.0'
spec.add_development_dependency 'rake', '~> 12'
spec.add_development_dependency 'rspec', '~> 3.7'
spec.add_development_dependency 'webmock', '~> 3.4'
|
Use Bundler 2 in development
Signed-off-by: Steven Hoffman <46f1a0bd5592a2f9244ca321b129902a06b53e03@fustrate.com>
|
diff --git a/config/initializers/11_party_foul.rb b/config/initializers/11_party_foul.rb
index abc1234..def5678 100644
--- a/config/initializers/11_party_foul.rb
+++ b/config/initializers/11_party_foul.rb
@@ -27,7 +27,8 @@ config.repo = 'coursewa.re'
# The background processor handler
- config.processor = PartyFoul::Processors::DelayedJob
+ # Disable for now, breaks things
+ # config.processor = PartyFoul::Processors::DelayedJob
# Additional labels to be added
config.additional_labels = ['party_foul-ed']
|
Disable background processing for party_foul.
|
diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
index abc1234..def5678 100644
--- a/config/initializers/active_record.rb
+++ b/config/initializers/active_record.rb
@@ -6,7 +6,7 @@ #-----
def self.search(in_parameters = {})
return all if (in_parameters.blank?)
- conditions = ['1']
+ conditions = []
parameters = in_parameters.delete_if { |key, v| [].include?(key) or v.blank? or v.empty? or (v.class == Array and (v - ['']).empty?) }
parameters.each do |k, v|
Rails.logger.info("K:#{k}=#{v}|blank:#{v.blank?}|empty:#{v.empty?}|#{v.inspect}")
@@ -23,7 +23,7 @@ conditions.push("%#{v}%")
end
end
- where(conditions)
+ where(conditions) unless (conditions.blank?)
end
##
|
Debug search method in ActiveRecord
|
diff --git a/config/initializers/refinery/i18n.rb b/config/initializers/refinery/i18n.rb
index abc1234..def5678 100644
--- a/config/initializers/refinery/i18n.rb
+++ b/config/initializers/refinery/i18n.rb
@@ -7,7 +7,7 @@
config.default_frontend_locale = :en
- config.frontend_locales = [:en, :fr]
+ config.frontend_locales = [:en]
- config.locales = {:en=>"English", :fr=>"Français"}
+ config.locales = {:en=>"English"}
end
|
Disable :fr lang in Refinery::I18n
|
diff --git a/config/software/coopr-provisioner.rb b/config/software/coopr-provisioner.rb
index abc1234..def5678 100644
--- a/config/software/coopr-provisioner.rb
+++ b/config/software/coopr-provisioner.rb
@@ -9,12 +9,7 @@ # relative_path 'coopr-provisioner'
build do
- gem 'install fog --no-rdoc --no-ri --version 1.36.0'
- gem 'install sinatra --no-rdoc --no-ri --version 1.4.5'
- gem 'install thin --no-rdoc --no-ri --version 1.6.2'
- gem 'install rest_client --no-rdoc --no-ri --version 1.7.3'
- gem 'install google-api-client --no-rdoc --no-ri --version 0.7.1'
- gem 'install deep_merge --no-rdoc --no-ri --version 1.0.1'
+ bundle 'install --jobs 7 --without test'
mkdir install_dir
copy "#{project_dir}/*", "#{install_dir}"
command "chmod +x #{install_dir}/bin/*"
|
Switch to using bundler to install Ruby Gems
|
diff --git a/ci_environment/nodejs/attributes/multi.rb b/ci_environment/nodejs/attributes/multi.rb
index abc1234..def5678 100644
--- a/ci_environment/nodejs/attributes/multi.rb
+++ b/ci_environment/nodejs/attributes/multi.rb
@@ -1,3 +1,3 @@-default[:nodejs][:default] = "0.10.33"
+default[:nodejs][:default] = "0.10.35"
default[:nodejs][:versions] = [ node[:nodejs][:default] ]
default[:nodejs][:aliases] = { node[:nodejs][:default] => node[:nodejs][:default][/\d+\.\d+/] }
|
Update default Node.js to 0.10.35
|
diff --git a/app/controllers/fb_friends_controller.rb b/app/controllers/fb_friends_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/fb_friends_controller.rb
+++ b/app/controllers/fb_friends_controller.rb
@@ -6,7 +6,7 @@
def index
fb_token = session[:fb_token]
- @people = FbService.get_my_friends(fb_token)
+ @people = FbService.get_my_friends(fb_token).order(:name)
end
def search_fb_friends
|
Order my friends by name
|
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -35,7 +35,7 @@ end
def return_error(exception)
- render json: { message: "We are sorry but something went wrong while processing your request" }
+ render json: { message: "We are sorry but something went wrong while processing your request" }, status: 500
end
end
|
Return status 500 when error happens
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,9 +11,9 @@ @cms_topnav = Cms::Site.find_by_identifier('topnav')
end
+
def store_location
- # store last url - this is needed for post-login redirect to whatever the user last visited.
- if (request.fullpath != new_user_session_path && \
+ if (!request.fullpath.match("/users/") &&
!request.xhr?) # don't store ajax calls
session[:previous_url] = request.fullpath
end
|
Fix redirect oddness after resetting password
|
diff --git a/lib/arabic_conjugator/form_I_hamzated.rb b/lib/arabic_conjugator/form_I_hamzated.rb
index abc1234..def5678 100644
--- a/lib/arabic_conjugator/form_I_hamzated.rb
+++ b/lib/arabic_conjugator/form_I_hamzated.rb
@@ -2,5 +2,9 @@
FORM_I_HAMZATED = {
"بدء" => "أ",
- "سءل" => "أ"
+ "سءل" => "أ",
+ "رءس" => "أ",
+ "بءس" => "ئ",
+ "رءي" => "أ",
+ "قرء" => "أ"
}
|
Add a few common verbs to hamzated verb hash
|
diff --git a/lib/dynamic_sitemaps/sitemap_result.rb b/lib/dynamic_sitemaps/sitemap_result.rb
index abc1234..def5678 100644
--- a/lib/dynamic_sitemaps/sitemap_result.rb
+++ b/lib/dynamic_sitemaps/sitemap_result.rb
@@ -9,6 +9,10 @@ @files = files
end
+ def name
+ sitemap.name
+ end
+
def host
sitemap.host
end
|
Add sitemap name to SitemapResult
|
diff --git a/app/controllers/concerns/sufia/catalog.rb b/app/controllers/concerns/sufia/catalog.rb
index abc1234..def5678 100644
--- a/app/controllers/concerns/sufia/catalog.rb
+++ b/app/controllers/concerns/sufia/catalog.rb
@@ -3,6 +3,9 @@ extend ActiveSupport::Concern
included do
self.search_params_logic += [:only_works_and_collections, :show_works_or_works_that_contain_files]
+
+ # include the all_type_tab view helper method
+ helper CurationConcerns::CatalogHelper
end
end
end
|
Include CurationConcern helper to provide all_type_tab method
|
diff --git a/lib/delocalize/parameter_delocalizing.rb b/lib/delocalize/parameter_delocalizing.rb
index abc1234..def5678 100644
--- a/lib/delocalize/parameter_delocalizing.rb
+++ b/lib/delocalize/parameter_delocalizing.rb
@@ -6,12 +6,12 @@
private
- def delocalize_hash(hash, options, key_stack = [])
+ def delocalize_hash(hash, options, base_key_stack = [])
hash.each do |key, value|
- key_stack = [*key_stack, key] # don't modify original key stack!
+ key_stack = [*base_key_stack, key] # don't modify original key stack!
hash[key] = value.is_a?(Hash) ?
- delocalize_hash(hash[key], options, key_stack) :
+ delocalize_hash(value, options, key_stack) :
delocalize_parse(options, key_stack, value)
end
end
|
Fix bug with modified key stack
|
diff --git a/lib/fabrication/generator/data_mapper.rb b/lib/fabrication/generator/data_mapper.rb
index abc1234..def5678 100644
--- a/lib/fabrication/generator/data_mapper.rb
+++ b/lib/fabrication/generator/data_mapper.rb
@@ -2,6 +2,10 @@
def self.supports?(klass)
defined?(DataMapper) && klass.ancestors.include?(DataMapper::Hook)
+ end
+
+ def build_instance
+ self.__instance = __klass.new(__attributes)
end
protected
|
Store DM attributes with mass assignment
|
diff --git a/lib/typhoeus/normalized_header_hash.rb b/lib/typhoeus/normalized_header_hash.rb
index abc1234..def5678 100644
--- a/lib/typhoeus/normalized_header_hash.rb
+++ b/lib/typhoeus/normalized_header_hash.rb
@@ -52,7 +52,7 @@
private
def convert_key(key)
- key.to_s.split(/_|-/).map { |segment| segment.capitalize }.join("-")
+ key.to_s.tr('_'.freeze,'-'.freeze).split('-'.freeze).map! { |segment| segment.capitalize }.join('-'.freeze)
end
end
end
|
Improve performance and memory consumption of NormalizedHeaderHash::convert_key method
- replace split by regex with tr and split by string
- freeze often used string literals
- use map! for in place mapping of segments
|
diff --git a/lib/overcommit/hook/pre_commit/sqlint.rb b/lib/overcommit/hook/pre_commit/sqlint.rb
index abc1234..def5678 100644
--- a/lib/overcommit/hook/pre_commit/sqlint.rb
+++ b/lib/overcommit/hook/pre_commit/sqlint.rb
@@ -1,5 +1,5 @@ module Overcommit::Hook::PreCommit
- # Runs 'sqlint' against any modified Puppet files.
+ # Runs 'sqlint' against any modified SQL files.
#
# @see https://github.com/purcell/sqlint
class Sqlint < Base
|
Fix mistake in Sqlint doc comment
That's what I get for copy-pasting!
|
diff --git a/lib/devise/orm/couchrest_model/schema.rb b/lib/devise/orm/couchrest_model/schema.rb
index abc1234..def5678 100644
--- a/lib/devise/orm/couchrest_model/schema.rb
+++ b/lib/devise/orm/couchrest_model/schema.rb
@@ -15,8 +15,14 @@
def find(*args)
options = args.extract_options!
- raise "You can't search with more than one condition yet =(" if options[:conditions].keys.size > 1
- find_by_key_and_value(options[:conditions].keys.first, options[:conditions].values.first)
+
+ if options.present?
+ raise "You can't search with more than one condition yet =(" if options[:conditions].keys.size > 1
+ find_by_key_and_value(options[:conditions].keys.first, options[:conditions].values.first)
+ else
+ id = args.flatten.compact.uniq.join
+ find_by_key_and_value(:id, id)
+ end
end
private
|
Modify Schema for registration edit
|
diff --git a/lib/tasks/remote_tables_maintenance.rake b/lib/tasks/remote_tables_maintenance.rake
index abc1234..def5678 100644
--- a/lib/tasks/remote_tables_maintenance.rake
+++ b/lib/tasks/remote_tables_maintenance.rake
@@ -20,7 +20,7 @@ CommonDataSingleton.instance.datasets[:datasets].each do |d|
v = CartoDB::Visualization::RemoteMember.new(
- d['name'], u.id, CartoDB::Visualization::Member::PRIVACY_PUBLIC, d['description'], [ d['category'] ])
+ d['name'], u.id, CartoDB::Visualization::Member::PRIVACY_PUBLIC, d['description'], [ 'common-data', d['category'] ])
v.store
end
|
Add common-data tag by default
|
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index abc1234..def5678 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file.
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
+Rails.application.config.action_dispatch.cookies_serializer = :json
|
Use JSON cookies as in wrapper
|
diff --git a/db/migrate/20160422174041_recipes.rb b/db/migrate/20160422174041_recipes.rb
index abc1234..def5678 100644
--- a/db/migrate/20160422174041_recipes.rb
+++ b/db/migrate/20160422174041_recipes.rb
@@ -2,6 +2,8 @@ def change
create_table :recipes do |t|
t.string :name
+ t.string :image_url
+ t.integer :servings
t.timestamps null: false
end
|
Add fields to recipe table
|
diff --git a/cookbooks/zookeeper/attributes/default.rb b/cookbooks/zookeeper/attributes/default.rb
index abc1234..def5678 100644
--- a/cookbooks/zookeeper/attributes/default.rb
+++ b/cookbooks/zookeeper/attributes/default.rb
@@ -3,8 +3,6 @@ # Attributes:: default
#
# Copyright 2012, Webtrends Inc.
-#
-# All rights reserved - Do Not Redistribute
#
default[:zookeeper][:version] = "3.3.6"
|
Remove the do not redistribute clause in the zookeeper cookbook. There's nothing webtrends specific in this
Former-commit-id: 4fad8f2232bb1447d361ea6a91a140d576bf84b8 [formerly 45f1a9aace9396eb81063db20753ac21fe3ddf21] [formerly 070a921e8f2dc5d4a26f810bbd10a8617981b1e8 [formerly 12aac02abc2c1be592d6780ff2d5e821c5140d21 [formerly 4b940ad47d6c4ea211a23095776650f9122993c7]]]
Former-commit-id: dddbe3b9b84b7128c09796f8936c8b05a6e051ed [formerly 5e9904fbbee0dcb37d7c94c48c3bd70bf9941451]
Former-commit-id: ee6fd0a9866fc3c53d06456e37eb6dcbf4a208f8
Former-commit-id: 7602d81846ff197a815f946bd2e946c9b61a227b
|
diff --git a/lib/data_hygiene/publishing_api_document_republisher.rb b/lib/data_hygiene/publishing_api_document_republisher.rb
index abc1234..def5678 100644
--- a/lib/data_hygiene/publishing_api_document_republisher.rb
+++ b/lib/data_hygiene/publishing_api_document_republisher.rb
@@ -20,7 +20,7 @@ def perform
logger.info "Queuing #{documents.count} #{edition_class} instances for republishing to the Publishing API"
documents.find_each do |document|
- Whitehall::PublishingApi.republish_document_async(document)
+ Whitehall::PublishingApi.republish_document_async(document, bulk: true)
logger << '.'
@queued += 1
end
|
Use the bulk_republishing queue in PubApiDocRepublisher
This is a special republisher that is used for Editions, but it seems
to be currently using the `default` queue. This means that when it's
used it will flood the `default` queue and block all other
republishing until it's done.
This commit switches it to use the `bulk_republishing` queue.
|
diff --git a/lib/kosmos/packages/procedural_fairings.rb b/lib/kosmos/packages/procedural_fairings.rb
index abc1234..def5678 100644
--- a/lib/kosmos/packages/procedural_fairings.rb
+++ b/lib/kosmos/packages/procedural_fairings.rb
@@ -0,0 +1,8 @@+class ProceduralFairings < Kosmos::Package
+ title 'Procedural Fairings'
+ url 'https://github.com/e-dog/ProceduralFairings/releases/download/v3.02/ProcFairings_3.02.zip'
+
+ def install
+ merge_directory 'GameData'
+ end
+end
|
Add a package for Procedural Fairings.
|
diff --git a/lib/munge/transformers/tilt_transformer.rb b/lib/munge/transformers/tilt_transformer.rb
index abc1234..def5678 100644
--- a/lib/munge/transformers/tilt_transformer.rb
+++ b/lib/munge/transformers/tilt_transformer.rb
@@ -13,7 +13,7 @@
def call(item, content = nil, renderer = nil)
scope = @pristine_scope.dup
- scope.instance_variable_set :@renderer, @renderer
+ scope.instance_variable_set(:@renderer, @renderer)
dirty_scope = extend_with_helpers(scope)
dirty_scope.instance_variable_set(:@tilt_options, @demands)
dirty_scope.render_with_layout(item, content_engines: renderer, content_override: content)
|
Add parenthesis around method call
|
diff --git a/lib/query_sort_by_params/param_sortable.rb b/lib/query_sort_by_params/param_sortable.rb
index abc1234..def5678 100644
--- a/lib/query_sort_by_params/param_sortable.rb
+++ b/lib/query_sort_by_params/param_sortable.rb
@@ -0,0 +1,41 @@+module QuerySortByParams
+ module ParamSortable
+ extend ActiveSupport::Concern
+
+ included do
+ end
+
+ module ClassMethods
+ def sort_by_params(params = {})
+ the_params = params.dup.with_indifferent_access
+ if the_params[:sort_by].present? && (match = the_params[:sort_by].to_s.match(/([a-zA-Z_]*)-([a-zA-Z]*)/)) && (2 < match.size)
+ matches = match.to_a
+ matched_direction = matches.pop.downcase
+ matched_field_name = matches.pop.downcase
+ field_name = self.columns_hash.keys.select { |key| key == matched_field_name }.first
+ if matched_direction == 'desc'
+ direction = 'desc'
+ else
+ direction = 'asc'
+ end
+ if field_name.present?
+ order(field_name => direction)
+ end
+ else
+ self
+ end
+ end
+
+ def sort_fields(options = {})
+ @@fields_to_sort ||= {}
+ unless @@fields_to_sort.try(:[], self.to_s).present?
+ @@fields_to_sort[self.to_s] = {}.with_indifferent_access
+ end
+ options.each do |key, value|
+ @@fields_to_sort[self.to_s][key.to_sym] = value
+ end
+ end
+ end
+ end
+end
+ActiveRecord::Base.send :include, QuerySortByParams::ParamSortable
|
Make sorting work with basic attributes corresponding to database fields.
|
diff --git a/app/commands/put_publish_intent.rb b/app/commands/put_publish_intent.rb
index abc1234..def5678 100644
--- a/app/commands/put_publish_intent.rb
+++ b/app/commands/put_publish_intent.rb
@@ -4,7 +4,7 @@ PathReservation.reserve_base_path!(base_path, payload[:publishing_app])
if downstream
- payload = Presenters::DownstreamPresenter::V1.present(publish_intent, transmitted_at: false)
+ payload = Presenters::DownstreamPresenter::V1.present(publish_intent, payload_version: false)
Adapters::ContentStore.put_publish_intent(base_path, payload)
end
|
Update `PutPublishIntent` command to omit `payload_version`
|
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -7,7 +7,7 @@ if ContentConfig.home_show_stats
@num_distributors = Enterprise.is_distributor.activated.visible.count
@num_producers = Enterprise.is_primary_producer.activated.visible.count
- @num_users = Spree::User.joins(:orders).merge(Spree::Order.complete).count('DISTINCT spree_users.*')
+ @num_users = Spree::Order.complete.count('DISTINCT user_id')
@num_orders = Spree::Order.complete.count
end
end
|
Rewrite user stat query for improved performance of homepage
|
diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -5,4 +5,20 @@ def new
@job = Job.new
end
+
+ def create
+ @job = Job.new(job_params)
+ if @job.save
+ flash[:notice] = "Created job."
+ redirect_to root_url
+ else
+ flash[:error] = @job.errors.full_messages[0]
+ render :action => 'new'
+ end
+ end
+
+ private
+ def job_params
+ params.require(:job).permit(:title, :type, :location, :experience, :majors, :description, :url, :instructions, :deadline, :salary)
+ end
end
|
Add create method to jobs controller
|
diff --git a/app/overrides/spree/orders/edit.rb b/app/overrides/spree/orders/edit.rb
index abc1234..def5678 100644
--- a/app/overrides/spree/orders/edit.rb
+++ b/app/overrides/spree/orders/edit.rb
@@ -1,6 +1,6 @@ Deface::Override.new(
virtual_path: 'spree/orders/edit',
name: 'Add PayPal button',
- insert_before: 'erb[loud]:contains("checkout-link")',
+ insert_after: 'erb[loud]:contains("checkout-link")',
partial: 'spree/braintree_vzero/paypal_checkout'
)
|
Move paypal button below checkout button
|
diff --git a/app/serializers/flow_serializer.rb b/app/serializers/flow_serializer.rb
index abc1234..def5678 100644
--- a/app/serializers/flow_serializer.rb
+++ b/app/serializers/flow_serializer.rb
@@ -31,7 +31,7 @@ Task.joins(paper: :journal)
.incomplete.unassigned
.where(type: "PaperAdminTask")
- .where(journals: {id: current_user.journal_ids})
+ .where(journals: {id: current_user.roles.pluck(:journal_id).uniq })
end
def flow_map
|
Fix flow serializer to obtain user journals
|
diff --git a/lib/cube_solver/algorithms.rb b/lib/cube_solver/algorithms.rb
index abc1234..def5678 100644
--- a/lib/cube_solver/algorithms.rb
+++ b/lib/cube_solver/algorithms.rb
@@ -0,0 +1,8 @@+module CubeSolver
+ module Algorithms
+ module PLL
+ T = "R U R' U' R' F R2 U' R' U' R U R' F'"
+ Y = "U F R U' R' U' R U R' F' R U R' U' R' F R F' U'"
+ end
+ end
+end
|
Add Algorithms module with T and Y PLLs
|
diff --git a/tests/spec/features/crate_types_spec.rb b/tests/spec/features/crate_types_spec.rb
index abc1234..def5678 100644
--- a/tests/spec/features/crate_types_spec.rb
+++ b/tests/spec/features/crate_types_spec.rb
@@ -0,0 +1,43 @@+require 'spec_helper'
+require 'support/editor'
+
+RSpec.feature "Building ", type: :feature, js: true do
+ before :each do
+ visit '/'
+ end
+
+ scenario "when the crate is a library" do
+ editor.set <<~EOF
+ #![crate_type="lib"]
+ fn main() {
+ println!("Hello, world");
+ }
+ EOF
+ click_on("Build")
+
+ within('.output-stderr') do
+ expect(page).to have_content 'function is never used: `main`'
+ end
+ end
+
+ scenario "when the crate is a library with tests" do
+ editor.set <<~EOF
+ #![crate_type="lib"]
+ pub fn add(a: u8, b: u8) -> u8 { a + b }
+
+ #[test]
+ fn test() {
+ assert_eq!(add(1, 2), 3);
+ }
+ EOF
+ click_on("Test")
+
+ within('.output-stdout') do
+ expect(page).to have_content 'running 1 test'
+ end
+ end
+
+ def editor
+ Editor.new(page)
+ end
+end
|
Add tests for compiling in different crate modes
|
diff --git a/lib/input_sanitizer/errors.rb b/lib/input_sanitizer/errors.rb
index abc1234..def5678 100644
--- a/lib/input_sanitizer/errors.rb
+++ b/lib/input_sanitizer/errors.rb
@@ -18,12 +18,12 @@
class ValueNotAllowedError < ValidationError
def code
- :invalid_value
+ :inclusion
end
- def initialize(value, message = nil)
+ def initialize(value)
@value = value
- super("given value: #{message}")
+ super("#{value} is not included in the list")
end
end
|
Change ValueNotAllowedError code & message
to match ActiveModel::Errors.
|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,9 @@ module ApplicationHelper
+ def tf_to_yn(status = false, capitalize = true)
+ output = status ? 'yes' : 'no'
+ capitalize ? output.capitalize : output
+ end
+
def bootstrap_class_for(flash_type)
case flash_type.to_sym
when :error, :alert
|
Add Helper for Converting T/F to Yes/No
|
diff --git a/lib/madride/templates/slim.rb b/lib/madride/templates/slim.rb
index abc1234..def5678 100644
--- a/lib/madride/templates/slim.rb
+++ b/lib/madride/templates/slim.rb
@@ -3,9 +3,6 @@
module Madride
class SlimTemplate < Slim::Template
- class << self
- attr_reader :default_mime_type
- @default_mime_type = 'text/html'
- end
+ self.default_mime_type = 'text/html'
end
end
|
Fix SlimTemplate mime type registration
|
diff --git a/lib/tasks/publishing_api.rake b/lib/tasks/publishing_api.rake
index abc1234..def5678 100644
--- a/lib/tasks/publishing_api.rake
+++ b/lib/tasks/publishing_api.rake
@@ -3,7 +3,14 @@ task :publish_special_routes => :environment do
require 'gds_api/publishing_api/special_route_publisher'
- publisher = GdsApi::PublishingApi::SpecialRoutePublisher.new(logger: Logger.new(STDOUT))
+ publishing_api = GdsApi::PublishingApi.new(
+ Plek.new.find('publishing-api'),
+ bearer_token: ENV['PUBLISHING_API_BEARER_TOKEN'] || 'example'
+ )
+ publisher = GdsApi::PublishingApi::SpecialRoutePublisher.new(
+ logger: Logger.new(STDOUT),
+ publishing_api: publishing_api
+ )
publisher.publish(
content_id: "81e8949b-a3fa-4712-97ff-decdd80024c8",
|
Use bearer token for publishing API authentication
|
diff --git a/config/initializers/rack-attack.rb b/config/initializers/rack-attack.rb
index abc1234..def5678 100644
--- a/config/initializers/rack-attack.rb
+++ b/config/initializers/rack-attack.rb
@@ -1,13 +1,8 @@ class Rack::Attack::Request
def direct_auth?
+ # Match paths starting with "/m/mission_name", but exclude "/m/mission_name/sms" paths
if path =~ %r{^/m/[a-z][a-z0-9]*/(.*)$}
- subpath = $1
-
- return true if subpath == 'formList.xml'
- return true if subpath =~ %r{^forms/([^/]+)\.xml$}
- return true if subpath =~ %r{^forms/([^/]+)/manifest\.xml$}
- return true if subpath =~ %r{^forms/([^/]+)/itemsets\.csv$}
- return true if subpath == 'submission.xml'
+ return $1 !~ /^sms/
end
end
end
|
203: Simplify throttling of ODK Collect endpoints
|
diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
index abc1234..def5678 100644
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
@@ -19,7 +19,6 @@ config.actions do
dashboard # mandatory
index # mandatory
- new
export
bulk_delete
show
@@ -31,4 +30,20 @@ # history_index
# history_show
end
+
+ config.model 'User' do
+ list do
+ field :id
+ field :email
+ field :applications
+ field :approved
+ field :created_at
+ field :confirmed_at
+ end
+ edit do
+ field :approved
+ field :applications
+ end
+ end
+
end
|
Allow admin to manage applications for users
|
diff --git a/cookbooks/ondemand_base/recipes/centos.rb b/cookbooks/ondemand_base/recipes/centos.rb
index abc1234..def5678 100644
--- a/cookbooks/ondemand_base/recipes/centos.rb
+++ b/cookbooks/ondemand_base/recipes/centos.rb
@@ -25,9 +25,9 @@ auth_config = data_bag_item('authorization', "ondemand")
# set root password from authorization databag
-#user "root" do
-# password auth_config['root_password']
-#end
+user "root" do
+ password auth_config['root_password']
+end
# add non-root user from authorization databag
if auth_config['alternate_user']
|
Add changing the root password to the CentOS recipe
|
diff --git a/spec/exchanges/coins_markets/integration/market_spec.rb b/spec/exchanges/coins_markets/integration/market_spec.rb
index abc1234..def5678 100644
--- a/spec/exchanges/coins_markets/integration/market_spec.rb
+++ b/spec/exchanges/coins_markets/integration/market_spec.rb
@@ -14,8 +14,8 @@ end
it 'fetch ticker' do
- dog_xgtc_pair = Cryptoexchange::Models::MarketPair.new(base: 'DOG', target: 'XGTC', market: 'coins_markets')
- ticker = client.ticker(dog_xgtc_pair)
+ pair = Cryptoexchange::Models::MarketPair.new(base: 'DOG', target: 'XGTC', market: 'coins_markets')
+ ticker = client.ticker(pair)
expect(ticker.base).to eq 'DOG'
expect(ticker.target).to eq 'XGTC'
|
Refactor longer varname to pair
|
diff --git a/lib/arraylist.rb b/lib/arraylist.rb
index abc1234..def5678 100644
--- a/lib/arraylist.rb
+++ b/lib/arraylist.rb
@@ -7,7 +7,8 @@ module ClassMethods
def list_field(field)
define_method "#{field}_list" do
- self.public_send(field).join(', ')
+ val = self.public_send(field)
+ val ? val.join(', ') : nil
end
define_method "#{field}_list=" do |arg|
|
Check for nil value before calling join.
|
diff --git a/lib/generators/translation_center/add_lang/add_lang_generator.rb b/lib/generators/translation_center/add_lang/add_lang_generator.rb
index abc1234..def5678 100644
--- a/lib/generators/translation_center/add_lang/add_lang_generator.rb
+++ b/lib/generators/translation_center/add_lang/add_lang_generator.rb
@@ -18,12 +18,12 @@ langs.each do |lang|
@lang = lang
# check if language already supported
- if(TranslationCenter::TranslationKey.column_names.include? "#{lang}_status")
+ if(TranslationCenter::TranslationKey.column_names.include? "#{lang.downcase}_status")
puts 'This language is already supported, just make sure it is listed in config/translation_center.yml'
return
end
# Generate migration templates for the models needed
- migration_template 'migrations/add_lang_status_translation_keys.rb', "db/migrate/add_#{lang}_status_translation_center_translation_keys.rb"
+ migration_template 'migrations/add_lang_status_translation_keys.rb', "db/migrate/add_#{lang.downcase}_status_translation_center_translation_keys.rb"
end
puts "Language(s) added, don't forget to add the language(s) to config/translation_center.yml"
end
|
Handle passing an uppercase language to add language generator
|
diff --git a/lib/cw/config.rb b/lib/cw/config.rb
index abc1234..def5678 100644
--- a/lib/cw/config.rb
+++ b/lib/cw/config.rb
@@ -25,8 +25,8 @@ end
end
end
- @config.params["wpm"] = 60 if(ENV["CW_ENV"] == "test")
- @config.params["effective_wpm"] = 60 if(ENV["CW_ENV"] == "test")
+ @config.params["wpm"] = 50 if(ENV["CW_ENV"] == "test")
+ @config.params["effective_wpm"] = 50 if(ENV["CW_ENV"] == "test")
@config
end
|
Reduce speed to 50 wpm for CI testing
|
diff --git a/make-sponsors.rb b/make-sponsors.rb
index abc1234..def5678 100644
--- a/make-sponsors.rb
+++ b/make-sponsors.rb
@@ -0,0 +1,19 @@+require "yaml"
+print "Enter the event in YYYY-city format: "
+cityname = gets.chomp
+config = YAML.load_file("data/events/#{cityname}.yml")
+sponsors = config['sponsors']
+sponsors.each {|s|
+ if File.exist?("data/sponsors/#{s['id']}.yml")
+ puts "The file for #{s['id']} totally exists already"
+ else
+ puts "I need to make a file for #{s['id']}"
+ puts "What is the sponsor URL?"
+ sponsor_url = gets.chomp
+ sponsorfile = File.open("data/sponsors/#{s['id']}.yml", "w")
+ sponsorfile.write "name: #{s['id']}\n"
+ sponsorfile.write "url: #{sponsor_url}\n"
+ sponsorfile.close
+ puts "It will be data/sponsors/#{s['id']}.yml"
+ end
+}
|
Create script for generating sponsor files
This ruby script basically reads in a city config file and creates the sponsor file associated with it. It will NOT create the images, naturally, but this will make it somewhat easier.
Former-commit-id: a31dbc664cf7c91c43bce9a16cbe27a60da4cdbc
|
diff --git a/lib/benzin/generators/plugin_generator.rb b/lib/benzin/generators/plugin_generator.rb
index abc1234..def5678 100644
--- a/lib/benzin/generators/plugin_generator.rb
+++ b/lib/benzin/generators/plugin_generator.rb
@@ -4,14 +4,16 @@
module Benzin
class PluginGenerator < Rails::Generators::PluginNewGenerator
- class_option :database, :type => :string, :aliases => '-d', :default => 'postgresql',
- :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+ class_option :database, type: :string, aliases: '-d', default: 'postgresql',
+ desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
- class_option :skip_test_unit, :type => :boolean, :aliases => '-T', :default => true,
- :desc => 'Skip Test::Unit files'
+ class_option :skip_test_unit, type: :boolean, aliases: '-T', default: true, desc: 'Skip Test::Unit files'
- class_option :skip_bundle, :type => :boolean, :aliases => '-B', :default => true,
- :desc => "Don't run bundle install"
+ class_option :skip_bundle, type: :boolean, aliases: '-B', default: true, desc: "Don't run bundle install"
+
+ class_option :mountable, type: :boolean, default: true, desc: "Generate mountable isolated application"
+
+ class_option :dummy_path, type: :string, default: "spec/dummy", desc: "Create dummy application at given path"
def finish_template
invoke :benzin_customization
|
Add default class options to create dummy app and and mountable engine
|
diff --git a/lib/daimon_skycrawlers/commands/runner.rb b/lib/daimon_skycrawlers/commands/runner.rb
index abc1234..def5678 100644
--- a/lib/daimon_skycrawlers/commands/runner.rb
+++ b/lib/daimon_skycrawlers/commands/runner.rb
@@ -14,6 +14,7 @@ require(File.expand_path(path, Dir.pwd))
log.info("Loaded crawler: #{path}")
end
+ require(File.expand_path("app/crawler.rb", Dri.pwd))
DaimonSkycrawlers::Crawler.run
rescue => ex
puts ex.message
@@ -27,6 +28,7 @@ require(File.expand_path(path, Dir.pwd))
log.info("Loaded processor: #{path}")
end
+ require(File.expand_path("app/processor.rb", Dir.pwd))
DaimonSkycrawlers::Processor.run
rescue => ex
puts ex.message
|
Load app/{crawler,processor}.rb when run crawler/processor
|
diff --git a/section03/lesson04/out_on_the_weekend.rb b/section03/lesson04/out_on_the_weekend.rb
index abc1234..def5678 100644
--- a/section03/lesson04/out_on_the_weekend.rb
+++ b/section03/lesson04/out_on_the_weekend.rb
@@ -0,0 +1,32 @@+# Section 3 - Lesson 4 - All the 'B's: Bb, Bbm, B, Bm
+# Rhythm - Half Beat Bounce
+# Out on the weekend - Neil Young
+require "#{Dir.home}/ruby/pianoforall/section03/lesson04/half_beat_bounce"
+use_synth :piano
+use_bpm 40
+
+in_thread(name: :right_hand) do
+ 2.times do
+ half_beat_bounce_treble(:A3)
+ end
+ half_beat_bounce_treble(:B3, :minor)
+ half_beat_bounce_treble(:B3, :minor7)
+ half_beat_bounce_treble(:E4, shift: -1)
+ half_beat_bounce_treble(:E4, 7, shift: -1)
+ 2.times do
+ half_beat_bounce_treble(:A3)
+ end
+end
+
+in_thread(name: :left_hand) do
+ 2.times do
+ half_beat_bounce_bass(:A2)
+ end
+ half_beat_bounce_bass(:B2)
+ half_beat_bounce_bass(:B2)
+ half_beat_bounce_bass(:E3, multiple: true)
+ half_beat_bounce_bass(:E3, multiple: true)
+ 2.times do
+ half_beat_bounce_bass(:A2)
+ end
+end
|
Add Out on the Weekend
|
diff --git a/lib/heroku/deploy/tasks/steal_manifest.rb b/lib/heroku/deploy/tasks/steal_manifest.rb
index abc1234..def5678 100644
--- a/lib/heroku/deploy/tasks/steal_manifest.rb
+++ b/lib/heroku/deploy/tasks/steal_manifest.rb
@@ -1,11 +1,15 @@ module Heroku::Deploy::Task
class StealManifest < Base
+ include Heroku::Deploy::Shell
+
def before_push
manifest_url = "http://#{app.host}/assets/manifest.yml"
asset_path = "public/assets"
- shell %{mkdir -p "#{asset_path}"}
- shell %{cd "#{asset_path}" && curl -O "#{manifest_url}"}
+ task "Stealing manifest from #{colorize manifest_url, :cyan}" do
+ shell %{mkdir -p "#{asset_path}"}
+ shell %{cd "#{asset_path}" && curl -O "#{manifest_url}"}
+ end
end
end
end
|
Make sure to include the shell when stealing the manifest.
|
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index abc1234..def5678 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -7,11 +7,6 @@ def make_request
get :index
end
-
- it 'should render the home/index template' do
- make_request
- response.should render_template("home/index")
- end
end
|
Remove home page for now
|
diff --git a/spec/unit/imap/backup/cli/mirror_spec.rb b/spec/unit/imap/backup/cli/mirror_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/imap/backup/cli/mirror_spec.rb
+++ b/spec/unit/imap/backup/cli/mirror_spec.rb
@@ -19,6 +19,7 @@ let(:pathname) { Pathname.new("path/folder.imap") }
before do
+ allow(Configuration).to receive(:exist?) { true }
allow(Configuration).to receive(:new) { config }
allow(Mirror).to receive(:new) { mirror }
allow(Pathname).to receive(:glob).and_yield(pathname)
|
Fix dependency on existing configuration
|
diff --git a/lib/scss_lint/linter/declaration_order.rb b/lib/scss_lint/linter/declaration_order.rb
index abc1234..def5678 100644
--- a/lib/scss_lint/linter/declaration_order.rb
+++ b/lib/scss_lint/linter/declaration_order.rb
@@ -18,18 +18,17 @@ end
if children != sorted_children
- add_lint(node.children.first)
+ add_lint(node.children.first, MESSAGE)
end
yield # Continue linting children
end
- def description
+ private
+
+ MESSAGE =
'Rule sets should start with @extend declarations, followed by ' <<
'properties and nested rule sets, in that order'
- end
-
- private
def important_node?(node)
DECLARATION_ORDER.include? node.class
|
Remove description method from DeclarationOrder
The `description` method is being deprecated.
Change-Id: I27efec67970d21e98a1fe3e8db95d6ff4c23090a
Reviewed-on: http://gerrit.causes.com/36726
Tested-by: jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@causes.com>
Reviewed-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f33d@causes.com>
|
diff --git a/lib/code/generator/code_generator.rb b/lib/code/generator/code_generator.rb
index abc1234..def5678 100644
--- a/lib/code/generator/code_generator.rb
+++ b/lib/code/generator/code_generator.rb
@@ -27,7 +27,7 @@ end
file_path = File.join @output_dir, sub_dir, "#{entity_name}.#{@language.name.downcase}"
- @logger.debug "Creating model file #{file_path}"
+ @logger.debug "Creating source file #{file_path}"
File.open(file_path, 'w') { |file| file.write content }
end
|
Add method to write source file.
|
diff --git a/app/controllers/additional_payment_payment_controller.rb b/app/controllers/additional_payment_payment_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/additional_payment_payment_controller.rb
+++ b/app/controllers/additional_payment_payment_controller.rb
@@ -31,7 +31,7 @@ @payment.save!
# Need to create the email for this!
- @user_event = payment.user_event
+ @user_event = @payment.user_event
# send email
ReceiptMailer.table_registration_payment_email(@registration_table).deliver
|
Use `@payment` instead of `payment`
|
diff --git a/app/helpers/application_helper/button/cockpit_console.rb b/app/helpers/application_helper/button/cockpit_console.rb
index abc1234..def5678 100644
--- a/app/helpers/application_helper/button/cockpit_console.rb
+++ b/app/helpers/application_helper/button/cockpit_console.rb
@@ -4,7 +4,7 @@ def disabled?
record_type = @record.respond_to?(:current_state) ? _('VM') : _('Container Node')
@error_message = _("The web-based console is not available because the %{record_type} is not powered on" % {:record_type => record_type}) unless on?
- @error_message = _('The web-based console is not available because the Windows platform is not supported') unless platform_supported?
+ @error_message = _('The web-based console is not available because the Windows platform is not supported') unless platform_supported?(record_type)
@error_message.present?
end
@@ -15,7 +15,11 @@ @record.ready_condition_status == 'True' if @record.respond_to?(:ready_condition_status) # Container status
end
- def platform_supported?
- @record.respond_to?(:current_state) && @record.platform.downcase != 'windows'
+ def platform_supported?(record_type)
+ if record_type == 'VM'
+ @record.platform.downcase != 'windows'
+ else
+ true
+ end
end
end
|
Fix logic error when displaying Cockpit button
https://bugzilla.redhat.com/show_bug.cgi?id=1447100
|
diff --git a/ops_care.gemspec b/ops_care.gemspec
index abc1234..def5678 100644
--- a/ops_care.gemspec
+++ b/ops_care.gemspec
@@ -23,10 +23,10 @@ spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
- spec.add_dependency "skylight", "~> 0"
- spec.add_dependency "okcomputer", "~> 1"
- spec.add_dependency "bugsnag", "~> 2"
- spec.add_dependency "logstasher", "~> 0"
+ spec.add_dependency "skylight"
+ spec.add_dependency "okcomputer"
+ spec.add_dependency "bugsnag"
+ spec.add_dependency "logstasher"
spec.add_development_dependency "bundler", "~> 1"
spec.add_development_dependency "rake", "~> 10.0"
|
Remove version constraints for dependencies
|
diff --git a/lib/mail_catcher/delivery_service.rb b/lib/mail_catcher/delivery_service.rb
index abc1234..def5678 100644
--- a/lib/mail_catcher/delivery_service.rb
+++ b/lib/mail_catcher/delivery_service.rb
@@ -21,8 +21,7 @@
def deliver!(recipient = config.recipient)
smtp = Net::SMTP.new config.address, config.port
- smtp.enable_starttls
- smtp.start(config.domain, config.user_name, config.password, config.authentication) do |smtp|
+ smtp.start() do |smtp|
smtp.send_message message['source'], config.user_name, recipient || message['recipients']
end
end
@@ -37,4 +36,4 @@ @@recipient = options[:delivery_recipient]
end
end
-end+end
|
Use localhost to do SMTP forward delivery in mailcatcher
|
diff --git a/lib/pg_search/migration/generator.rb b/lib/pg_search/migration/generator.rb
index abc1234..def5678 100644
--- a/lib/pg_search/migration/generator.rb
+++ b/lib/pg_search/migration/generator.rb
@@ -3,7 +3,7 @@ module PgSearch
module Migration
class Generator < Rails::Generators::Base
- hide!
+ Rails::Generators.hide_namespace namespace
def self.inherited(subclass)
super
|
Fix Generator's compatibility with Rails 3.x
(Fixes #185)
|
diff --git a/lib/x-editable-rails/view_helpers.rb b/lib/x-editable-rails/view_helpers.rb
index abc1234..def5678 100644
--- a/lib/x-editable-rails/view_helpers.rb
+++ b/lib/x-editable-rails/view_helpers.rb
@@ -3,23 +3,22 @@ module Rails
module ViewHelpers
def editable(object, method, options = {})
- object = object.last if object.kind_of?(Array)
-
- safe_value = value = object.send(method)
- safe_value = value.html_safe if value.respond_to? :html_safe
url = polymorphic_path(object)
+ object = object.last if object.kind_of?(Array)
+ value = options.delete(:value){ object.send(method) }
if xeditable? and can?(:edit, object)
model = object.class.name.split('::').last.underscore
klass = options[:nested] ? object.class.const_get(options[:nested].to_s.singularize.capitalize) : object.class
+ output_value = output_value_for(value)
tag = options.fetch(:tag, 'span')
title = options.fetch(:title, klass.human_attribute_name(method))
data = {
type: options.fetch(:type, 'text'),
model: model,
name: method,
- value: value,
+ value: output_value,
url: url,
nested: options[:nested],
nid: options[:nid]
@@ -32,6 +31,23 @@ options.fetch(:e, value)
end
end
+
+ private
+
+ def output_value_for(value)
+ value = case value
+ when TrueClass
+ '1'
+ when FalseClass
+ '0'
+ when NilClass
+ ''
+ else
+ value.to_s
+ end
+
+ value.html_safe
+ end
end
end
end
|
Format value as output value such as booleans converted to 1 and 0
|
diff --git a/db/migrate/20150423144533_add_block_to_environment_and_profile.rb b/db/migrate/20150423144533_add_block_to_environment_and_profile.rb
index abc1234..def5678 100644
--- a/db/migrate/20150423144533_add_block_to_environment_and_profile.rb
+++ b/db/migrate/20150423144533_add_block_to_environment_and_profile.rb
@@ -0,0 +1,15 @@+class AddBlockToEnvironmentAndProfile < ActiveRecord::Migration
+ def up
+ Environment.all.each do |env|
+ env.boxes << Box.new if env.boxes.count < 4
+ end
+
+ Profile.all.each do |profile|
+ profile.boxes << Box.new if profile.boxes.count < 4
+ end
+ end
+
+ def down
+ say "this migration can't be reverted"
+ end
+end
|
Migrate for add the fourth box.
Migrate for add the fourth box to existing enviroments and profiles.
Signed-off-by: Thiago Ribeiro <25630c3dd4509f5915a846461794b51273be2039@hotmail.com>
|
diff --git a/react-native-amplitude-analytics.podspec b/react-native-amplitude-analytics.podspec
index abc1234..def5678 100644
--- a/react-native-amplitude-analytics.podspec
+++ b/react-native-amplitude-analytics.podspec
@@ -16,5 +16,5 @@
s.dependency "React"
- s.dependency "Amplitude-iOS", "~> 3.14.1"
+ s.dependency "Amplitude-iOS", "~> 4.0.4"
end
|
[FIX] Upgrade Amplitude version to 4.0.4 in podspec
|
diff --git a/lib/garage/test/authentication_helper.rb b/lib/garage/test/authentication_helper.rb
index abc1234..def5678 100644
--- a/lib/garage/test/authentication_helper.rb
+++ b/lib/garage/test/authentication_helper.rb
@@ -6,7 +6,7 @@ module AuthenticationHelper
def stub_access_token_request(attributes = {})
Hashie::Mash.new(
- application_id: SecureRandom.hex(32),
+ application_id: 1,
expired_at: 1.month.since,
scope: "",
token: SecureRandom.hex(32),
|
Fix test helper: app id must be an integer
|
diff --git a/qmetrics.gemspec b/qmetrics.gemspec
index abc1234..def5678 100644
--- a/qmetrics.gemspec
+++ b/qmetrics.gemspec
@@ -20,6 +20,6 @@
spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
- spec.add_development_dependency "rspec", "~> 3.2.0"
- spec.add_runtime_dependency "httparty", "~> 0.13.3"
+ spec.add_development_dependency "rspec", "~> 3.2"
+ spec.add_runtime_dependency "httparty", "~> 0.13"
end
|
Fix warning for overly strict dependencies
Modify gemspec to loosen restrictions on rspec and httparty versions.
|
diff --git a/spec/models/workshop_project_click_spec.rb b/spec/models/workshop_project_click_spec.rb
index abc1234..def5678 100644
--- a/spec/models/workshop_project_click_spec.rb
+++ b/spec/models/workshop_project_click_spec.rb
@@ -9,7 +9,7 @@ # override in subtests
let(:headers) { {} }
- before { get "v1/posts/#{project.id}/redirect/live", headers: headers }
+ before { get "/v1/posts/#{project.id}/redirect/live", headers: headers }
it 'redirects to correct url' do
expect(response.status).to eq(302)
|
Fix typo in test URL
|
diff --git a/lib/docman/commands/execute_script_cmd.rb b/lib/docman/commands/execute_script_cmd.rb
index abc1234..def5678 100644
--- a/lib/docman/commands/execute_script_cmd.rb
+++ b/lib/docman/commands/execute_script_cmd.rb
@@ -20,7 +20,11 @@ Dir.chdir self['execution_dir']
logger.info "Script execution: #{self['location']}"
params = self['params'].nil? ? '' : prepare_params(self['params'])
- `chmod 777 #{self['location']}`
+
+ # Fix for ^M issue when saved from GitLab or windows.
+ `cat #{self['location']} | tr -d '\r' > #{self['location']}-tmp`
+ `rm -f #{self['location']}`
+ `mv #{self['location']}-tmp #{self['location']}`
`chmod a+x #{self['location']}`
logger.info `#{self['location']} #{params}`
$?.exitstatus
|
Fix for ^M for executable files
|
diff --git a/lib/magellan/gcs/proxy/expand_variable.rb b/lib/magellan/gcs/proxy/expand_variable.rb
index abc1234..def5678 100644
--- a/lib/magellan/gcs/proxy/expand_variable.rb
+++ b/lib/magellan/gcs/proxy/expand_variable.rb
@@ -52,6 +52,7 @@
case value
when String then quote_string ? value.to_s : value
+ when Array then value.flatten.join(' ')
else value.to_s
end
end
|
:bug: Expand Array object to string joined with space
|
diff --git a/spec/factories/mdui_geolocation_hints.rb b/spec/factories/mdui_geolocation_hints.rb
index abc1234..def5678 100644
--- a/spec/factories/mdui_geolocation_hints.rb
+++ b/spec/factories/mdui_geolocation_hints.rb
@@ -1,6 +1,12 @@ FactoryGirl.define do
factory :mdui_geolocation_hint, class: 'MDUI::GeolocationHint' do
- uri { "geo:#{Faker::Number.number(3)},#{Faker::Number.number(3)}" }
+ transient { components(2) }
+
+ uri { "geo:#{(1..components).map { Faker::Number.number(3) }.join(',')}" }
association :disco_hints, factory: :mdui_disco_hint
+
+ trait :with_altitude do
+ transient { components(3) }
+ end
end
end
|
Add trait to create GeolocationHint with attitude
Err, I mean altitude.
|
diff --git a/search-engine/lib/format/format_pauper.rb b/search-engine/lib/format/format_pauper.rb
index abc1234..def5678 100644
--- a/search-engine/lib/format/format_pauper.rb
+++ b/search-engine/lib/format/format_pauper.rb
@@ -7,6 +7,7 @@ card.printings.each do |printing|
next if @time and printing.release_date > @time
next if @excluded_sets.include?(printing.set_code)
+ next if printing.set.custom?
return true if printing.rarity == "common" or printing.rarity == "basic"
end
false
|
Fix Pauper including custom cards for some reason
|
diff --git a/serverspec/spec/all/all_configure_spec.rb b/serverspec/spec/all/all_configure_spec.rb
index abc1234..def5678 100644
--- a/serverspec/spec/all/all_configure_spec.rb
+++ b/serverspec/spec/all/all_configure_spec.rb
@@ -10,8 +10,8 @@
describe 'connect jmx_server' do
servers = property[:servers]
- servers['roles'].each do |svr_name,server|
- server['roles'].each do |var|
+ servers.each do |svr_name,server|
+ server.each do |var|
case var
when "ap" then
if File.exist?('/etc/sysconfig/tomcat7')
|
Modify logic of spec test files.
|
diff --git a/spec/controllers/label_controller_spec.rb b/spec/controllers/label_controller_spec.rb
index abc1234..def5678 100644
--- a/spec/controllers/label_controller_spec.rb
+++ b/spec/controllers/label_controller_spec.rb
@@ -1,19 +1,28 @@ require 'rails_helper'
RSpec.describe LabelController, type: :controller do
+ let(:recipe) { Recipe.create(recipe_attributes) }
+ let(:recipe_attributes) do
+ {
+ user: user,
+ name: 'recipe test'
+ }
+ end
+
+ login_user
describe "GET #new" do
it "returns http success" do
- get :new
+ get :new, params: { id: recipe.id }
expect(response).to have_http_status(:success)
end
end
describe "GET #create" do
it "returns http success" do
- get :create
+ get :create, params: { id: recipe.id }
expect(response).to have_http_status(:success)
+ expect(response.content_type).to eq "application/pdf"
end
end
-
end
|
Fix specs for label controller
|
diff --git a/spec/shared/api_interface_behaviour.rb b/spec/shared/api_interface_behaviour.rb
index abc1234..def5678 100644
--- a/spec/shared/api_interface_behaviour.rb
+++ b/spec/shared/api_interface_behaviour.rb
@@ -0,0 +1,15 @@+# encoding: utf-8
+
+shared_examples_for 'api interface' do
+
+ it { should respond_to :endpoint }
+
+ it { should respond_to :site }
+
+ it { should respond_to :user }
+
+ it { should respond_to :repo }
+
+ it { should respond_to :adapter }
+
+end
|
Add shared examples for api interface.
|
diff --git a/lib/hamlbars/compiler_extension.rb b/lib/hamlbars/compiler_extension.rb
index abc1234..def5678 100644
--- a/lib/hamlbars/compiler_extension.rb
+++ b/lib/hamlbars/compiler_extension.rb
@@ -9,17 +9,32 @@ # Overload build_attributes in Haml::Compiler to allow
# for the creation of handlebars bound attributes by
# adding :bind hash to the tag attributes.
- def build_attributes_with_bindings (is_html, attr_wrapper, escape_attrs, attributes={})
+ def build_attributes_with_handlebars_attributes (is_html, attr_wrapper, escape_attrs, attributes={})
attributes[:bind] = attributes.delete('bind') if attributes['bind']
- bindings = if attributes[:bind].is_a? Hash
- " {{bindAttr#{build_attributes_without_bindings(is_html, '"', escape_attrs, attributes.delete(:bind))}}}"
- else
- ''
- end
- build_attributes_without_bindings(is_html, attr_wrapper, escape_attrs, attributes) + bindings
+ attributes[:event] = attributes.delete('event') if attributes['event']
+ attributes[:events] = attributes.delete('events') if attributes['events']
+ attributes[:events] ||= []
+ attributes[:events] << attributes.delete(:event) if attributes[:event]
+
+ handlebars_rendered_attributes = []
+ handlebars_rendered_attributes << handlebars_attributes('bindAttr', is_html, escape_attrs, attributes.delete(:bind)) if attributes[:bind]
+ attributes[:events].each do |event|
+ on = event.delete('on') || event.delete(:on) || 'click'
+ handlebars_rendered_attributes << handlebars_attributes("action \"#{on}\"", is_html, escape_attrs, event)
+ end
+ attributes.delete(:events)
+
+ (handlebars_rendered_attributes * '') +
+ build_attributes_without_handlebars_attributes(is_html, attr_wrapper, escape_attrs, attributes)
end
- alias build_attributes_without_bindings build_attributes
- alias build_attributes build_attributes_with_bindings
+ alias build_attributes_without_handlebars_attributes build_attributes
+ alias build_attributes build_attributes_with_handlebars_attributes
+
+ private
+
+ def handlebars_attributes(helper, is_html, escape_attrs, attributes)
+ " {{#{helper}#{build_attributes_without_handlebars_attributes(is_html, '"', escape_attrs, attributes)}}}"
+ end
end
end
end
|
Add the event helper to tag attributes.
|
diff --git a/lib/motel/property/multi_tenant.rb b/lib/motel/property/multi_tenant.rb
index abc1234..def5678 100644
--- a/lib/motel/property/multi_tenant.rb
+++ b/lib/motel/property/multi_tenant.rb
@@ -29,7 +29,7 @@ end
def connection_pool
- connection_handler.retrieve_connection_pool(motel.determines_tenant) or raise ActiveRecord::ConnectionNotEstablished
+ connection_handler.retrieve_connection_pool(motel.determines_tenant)
end
def retrieve_connection
|
Remove raise error in connection_pool method for Base class.
|
diff --git a/driveregator.gemspec b/driveregator.gemspec
index abc1234..def5678 100644
--- a/driveregator.gemspec
+++ b/driveregator.gemspec
@@ -4,21 +4,22 @@ require 'driveregator/version'
Gem::Specification.new do |spec|
- spec.name = "driveregator"
+ spec.name = 'driveregator'
spec.version = Driveregator::VERSION
- spec.authors = ["LuckyThirteen"]
- spec.email = ["baloghzsof@gmail.com"]
+ spec.authors = ['LuckyThirteen']
+ spec.email = ['baloghzsof@gmail.com']
spec.summary = %q{Command line tool for listing GoogleDrive permissons}
- spec.license = "MIT"
+ spec.license = 'MIT'
spec.files = `git ls-files`.split($/)
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_paths = ["lib"]
+ spec.require_paths = ['lib']
- spec.add_development_dependency "bundler", "~> 1.3"
- spec.add_development_dependency "rake"
+ spec.add_development_dependency 'bundler', '~> 1.3'
+ spec.add_development_dependency 'rake'
- spec.add_dependency "google-api-client"
- spec.add_dependency "launchy"
+ spec.add_dependency 'google-api-client'
+ spec.add_dependency 'launchy'
+ spec.add_dependency 'highline'
end
|
Add HighLine gem to the dependencies.
|
diff --git a/test/integration/generated_warnlib_test.rb b/test/integration/generated_warnlib_test.rb
index abc1234..def5678 100644
--- a/test/integration/generated_warnlib_test.rb
+++ b/test/integration/generated_warnlib_test.rb
@@ -0,0 +1,20 @@+require 'gir_ffi_test_helper'
+
+GirFFI.setup :WarnLib
+
+describe WarnLib do
+ describe 'WarnLib::Whatever' do
+ it 'has a working method #do_boo' do
+ skip 'Needs testing'
+ end
+ it 'has a working method #do_moo' do
+ skip 'Needs testing'
+ end
+ end
+ it 'has a working function #throw_unpaired' do
+ skip 'Needs testing'
+ end
+ it 'has a working function #unpaired_error_quark' do
+ skip 'Needs testing'
+ end
+end
|
Add skipped tests for WarnLib
|
diff --git a/ruby-eval-in.gemspec b/ruby-eval-in.gemspec
index abc1234..def5678 100644
--- a/ruby-eval-in.gemspec
+++ b/ruby-eval-in.gemspec
@@ -1,13 +1,13 @@ Gem::Specification.new do |s|
s.name = 'ruby-eval-in'
- s.version = '0.0.3'
+ s.version = '0.0.4'
s.required_ruby_version = '>= 2.0.0'
s.summary = 'ruby-eval-in - A Ruby interface to https://eval.in/.'
s.description = 'A Ruby interface to https://eval.in/.'
s.authors = ['William Woodruff']
s.email = 'william@tuffbizz.com'
s.files = Dir['LICENSE', 'README.md', '.yardopts', 'lib/**/*.rb']
- s.add_dependency 'nokogiri', '~> 0'
+ s.add_dependency 'nokogiri'
s.bindir = 'bin'
s.executables << 'eval-in'
s.homepage = 'https://github.com/woodruffw/ruby-eval-in'
|
gemspec: Fix incorrect dependency version spec, bump to 0.0.4.
|
diff --git a/actioncable/lib/action_cable/zeitwerk.rb b/actioncable/lib/action_cable/zeitwerk.rb
index abc1234..def5678 100644
--- a/actioncable/lib/action_cable/zeitwerk.rb
+++ b/actioncable/lib/action_cable/zeitwerk.rb
@@ -1,3 +1,5 @@+# frozen_string_literal: true
+
require "zeitwerk"
lib = File.expand_path("..", __dir__)
|
Add missing magic comment (linting)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.