http://www.its-not-its.info/ (Just say no to contractions!) --- src/api/app/assets/javascripts/webui/application/jquery.mobile.js | 2 +- src/api/app/controllers/source_controller.rb | 2 +- src/api/app/models/package_build_status.rb | 2 +- src/api/app/models/project.rb | 2 +- src/api/lib/opensuse/backend.rb | 2 +- src/api/public/402.html | 2 +- src/api/test/functional/maintenance_test.rb | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/app/assets/javascripts/webui/application/jquery.mobile.js b/src/api/app/assets/javascripts/webui/application/jquery.mobile.js index 058936c..4cca123 100644 --- a/src/api/app/assets/javascripts/webui/application/jquery.mobile.js +++ b/src/api/app/assets/javascripts/webui/application/jquery.mobile.js @@ -3545,7 +3545,7 @@ $.mobile.getMaxScrollForTransition = $.mobile.getMaxScrollForTransition || defau // test that the form is, itself, ajax false $this.is(":jqmData(ajax='false')") || // test that $.mobile.ignoreContentEnabled is set and - // the form or one of it's parents is ajax=false + // the form or one of its parents is ajax=false !$this.jqmHijackable().length ) { return; } diff --git a/src/api/app/controllers/source_controller.rb b/src/api/app/controllers/source_controller.rb index 4f2c678..fa27762 100644 --- a/src/api/app/controllers/source_controller.rb +++ b/src/api/app/controllers/source_controller.rb @@ -161,7 +161,7 @@ class SourceController < ApplicationController end end - # Find open requests which have a review involving this project (or it's packages) and remove those reviews + # Find open requests which have a review involving this project (or its packages) and remove those reviews # but leave the requests otherwise untouched. pro.open_requests_with_by_project_review.each do |request| request.remove_reviews(:by_project => pro.name) diff --git a/src/api/app/models/package_build_status.rb b/src/api/app/models/package_build_status.rb index 2cbbfde..3b62906 100644 --- a/src/api/app/models/package_build_status.rb +++ b/src/api/app/models/package_build_status.rb @@ -112,7 +112,7 @@ class PackageBuildStatus if currentcode == 'excluded' @buildcode='excluded' end - # if it's currently succeeded but !@everbuilt, it's different sources + # if it's currently succeeded but !@everbuilt, they are different sources if currentcode == 'succeeded' if @srcmd5 == current_srcmd5 @buildcode='building' # guesssing diff --git a/src/api/app/models/project.rb b/src/api/app/models/project.rb index f51ef5b..3683820 100644 --- a/src/api/app/models/project.rb +++ b/src/api/app/models/project.rb @@ -318,7 +318,7 @@ class Project < ActiveRecord::Base rescue Package::DeleteError => e e.packages.each do |p| if p.project != self - raise DeleteError.new "Package #{self.name}/{pkg.name} can not be deleted as it's devel package of #{p.project.name}/#{p.name}" + raise DeleteError.new "Package #{self.name}/{pkg.name} can not be deleted as it's the devel package of #{p.project.name}/#{p.name}" end end end diff --git a/src/api/lib/opensuse/backend.rb b/src/api/lib/opensuse/backend.rb index 753ea7c..1f3594e 100644 --- a/src/api/lib/opensuse/backend.rb +++ b/src/api/lib/opensuse/backend.rb @@ -225,7 +225,7 @@ module Suse end def wait_for_scheduler_start - # make sure it's actually tried to start + # make sure it actually tried to start start_test_backend Rails.logger.debug 'Wait for scheduler thread to finish start' counter = 0 diff --git a/src/api/public/402.html b/src/api/public/402.html index 071cf01..f4f02f3 100644 --- a/src/api/public/402.html +++ b/src/api/public/402.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> <html> <body> - <h1>You're user name is registered but unconfirmed</h1> + <h1>Your user name is registered but unconfirmed</h1> <p>Please stay patient.</p> <em>code: 402</em> </body> diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb index a55f7ce..fd1010d 100644 --- a/src/api/test/functional/maintenance_test.rb +++ b/src/api/test/functional/maintenance_test.rb @@ -916,7 +916,7 @@ class MaintenanceTests < ActionDispatch::IntegrationTest # the birthday of J.K. Timecop.freeze(2010, 7, 12) - # setup 'My:Maintenance' as a maintenance project by fetching it's meta and set a type + # setup 'My:Maintenance' as a maintenance project by fetching its meta and set a type get '/source/My:Maintenance/_meta' assert_response :success maintenance_project_meta = REXML::Document.new(@response.body) @@ -1263,7 +1263,7 @@ class MaintenanceTests < ActionDispatch::IntegrationTest assert node.has_attribute?(:id) reqid = node.value(:id) - # find the request for the maintenance incident through it's parent (maintenance) project + # find the request for the maintenance incident through its parent (maintenance) project get '/request?view=collection&types=maintenance_release&project=My:Maintenance&subprojects=true' assert_response :success assert_xml_tag( :tag => 'collection', :child => {:tag => 'request' } ) -- 1.8.4 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org