Merge pull request #243 from jojosch/fix-typos

Fix typos
gitlabhq · Aug 2, 2013 · 5f03883 · 5f03883
2 parents 777c18b + ff6c31b
commit 5f03883
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -23,4 +23,4 @@ $ ->
     descr.next('.runner-description-form').show()
 
   $('.assign-all-runner').on 'click', ->
-    $(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progres..')
+    $(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progress..')
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -96,7 +96,7 @@ def current_controller?(*args)
     args.any? { |v| v.to_s.downcase == controller.controller_name }
   end
 
-  # Check if a partcular action is the current one
+  # Check if a particular action is the current one
   #
   # args - One or more action names to check
   #

diff --git a/app/models/project.rb b/app/models/project.rb
@@ -146,7 +146,7 @@ def valid_token? token
   end
 
   def no_running_builds?
-    # Get running builds not later than 3 days ago to ignore hungs
+    # Get running builds not later than 3 days ago to ignore hangs
     builds.running.where("updated_at > ?", 3.days.ago).empty?
   end
 end

diff --git a/doc/installation.md b/doc/installation.md
@@ -138,7 +138,7 @@ You can use either MySQL or PostgreSQL.
     sudo -u gitlab_ci -H bundle exec rake db:setup RAILS_ENV=production
 
 
-    # Setup scedules 
+    # Setup schedules
     #
     sudo -u gitlab_ci -H bundle exec whenever -w RAILS_ENV=production