summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/notes.js2
-rw-r--r--app/controllers/admin/users_controller.rb4
-rw-r--r--app/controllers/projects/team_members_controller.rb2
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/models/namespace.rb2
-rw-r--r--app/models/network/graph.rb4
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/user.rb2
-rw-r--r--app/models/wiki_page.rb2
-rw-r--r--app/observers/activity_observer.rb2
-rw-r--r--app/services/notification_service.rb4
-rw-r--r--app/views/help/public_access.html.haml2
-rw-r--r--app/views/projects/compare/show.html.haml2
-rw-r--r--app/views/projects/new.html.haml2
-rw-r--r--app/views/projects/wikis/_new.html.haml2
15 files changed, 18 insertions, 18 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 6dfe722a5e8..5e1e4dc4113 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -177,7 +177,7 @@ var NoteList = {
var form = $(this).closest("form");
var row = form.closest("tr");
- // show the reply button (will only work for replys)
+ // show the reply button (will only work for replies)
form.prev(".js-discussion-reply-button").show();
if (row.is(".js-temp-notes-holder")) {
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 62b9fe08091..7703ae8b249 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ApplicationController
if user.block
redirect_to :back, alert: "Successfully blocked"
else
- redirect_to :back, alert: "Error occured. User was not blocked"
+ redirect_to :back, alert: "Error occurred. User was not blocked"
end
end
@@ -32,7 +32,7 @@ class Admin::UsersController < Admin::ApplicationController
if user.activate
redirect_to :back, alert: "Successfully unblocked"
else
- redirect_to :back, alert: "Error occured. User was not unblocked"
+ redirect_to :back, alert: "Error occurred. User was not unblocked"
end
end
diff --git a/app/controllers/projects/team_members_controller.rb b/app/controllers/projects/team_members_controller.rb
index 07ad7d86153..6fee770cae2 100644
--- a/app/controllers/projects/team_members_controller.rb
+++ b/app/controllers/projects/team_members_controller.rb
@@ -49,7 +49,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
def apply_import
giver = Project.find(params[:source_project_id])
status = @project.team.import(giver)
- notice = status ? "Succesfully imported" : "Import failed"
+ notice = status ? "Successfully imported" : "Import failed"
redirect_to project_team_index_path(project), notice: notice
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9b10d90fecb..e752e9fe65e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -35,7 +35,7 @@ module ApplicationHelper
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/namespace.rb b/app/models/namespace.rb
index c74e0cf5a1d..18959166931 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -73,7 +73,7 @@ class Namespace < ActiveRecord::Base
gitlab_shell.rm_satellites(path_was)
send_update_instructions
rescue
- # Returning false does not rolback after_* transaction but gives
+ # Returning false does not rollback after_* transaction but gives
# us information about failing some of tasks
false
end
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index da815a85924..1d21e96369a 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -43,9 +43,9 @@ module Network
# Method is adding time and space on the
# list of commits. As well as returns date list
- # corelated with time set on commits.
+ # correlated with time set on commits.
#
- # @return [Array<TimeDate>] list of commit dates corelated with time on commits
+ # @return [Array<TimeDate>] list of commit dates correlated with time on commits
def index_commits
days = []
@map = {}
diff --git a/app/models/project.rb b/app/models/project.rb
index 8297c11ba8a..497ed1a218c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -432,7 +432,7 @@ class Project < ActiveRecord::Base
gitlab_shell.rm_satellites(old_path_with_namespace)
send_move_instructions
rescue
- # Returning false does not rolback after_* transaction but gives
+ # Returning false does not rollback after_* transaction but gives
# us information about failing some of tasks
false
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 193349c95fc..a149b3a0322 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -155,7 +155,7 @@ class User < ActiveRecord::Base
# Class methods
#
class << self
- # Devise method overriden to allow sing in with email or username
+ # Devise method overridden to allow sing in with email or username
def find_for_database_authentication(warden_conditions)
conditions = warden_conditions.dup
if login = conditions.delete(:login)
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 497d69e8e90..b7629b9f24c 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -143,7 +143,7 @@ class WikiPage
save :update_page, @page, content, format, message
end
- # Destroys the WIki Page.
+ # Destroys the Wiki Page.
#
# Returns boolean True or False.
def delete
diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb
index ee3e4629b4c..4f4eb36a188 100644
--- a/app/observers/activity_observer.rb
+++ b/app/observers/activity_observer.rb
@@ -8,7 +8,7 @@ class ActivityObserver < BaseObserver
# Skip system status notes like 'status changed to close'
return true if record.note.include?("_Status changed to ")
- # Skip wall notes to prevent spaming of dashboard
+ # Skip wall notes to prevent spamming of dashboard
return true if record.noteable_type.blank?
end
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index f3dc552a8e7..b5cf5cedd6b 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -1,6 +1,6 @@
# NotificationService class
#
-# Used for notifing users with emails about different events
+# Used for notifying users with emails about different events
#
# Ex.
# NotificationService.new.new_issue(issue, current_user)
@@ -90,7 +90,7 @@ class NotificationService
# Notify new user with email after creation
def new_user(user)
- # Dont email omniauth created users
+ # Don't email omniauth created users
mailer.new_user_email(user.id, user.password) unless user.extern_uid?
end
diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml
index 94aaeff88d7..c67402ee319 100644
--- a/app/views/help/public_access.html.haml
+++ b/app/views/help/public_access.html.haml
@@ -3,7 +3,7 @@
%p
GitLab allows you to open selected projects to be accessed publicly.
- These projects will be clonable
+ These projects will be cloneable
%em without any
authentication.
Also they will be listed on the #{link_to "public access directory", public_root_path}.
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 5e6b5b71753..f2e65f68da6 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -9,7 +9,7 @@
.alert.alert-block
%p
%strong Warning! This comparison include 100+ commits.
- %p To prevent performance issue we dont show diff information.
+ %p To prevent performance issue we don't show diff information.
- if @commits.present?
%div.ui-box
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index ba389018d59..31343f5eb72 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -28,7 +28,7 @@
.input
= f.text_field :import_url, class: 'xlarge', placeholder: 'https://github.com/randx/six.git'
.light
- URL must be clonable
+ URL must be cloneable
%p.padded
New projects are private by default. You choose who can see the project and commit to repository.
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index 66f28b8b804..c52fbcb58f6 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -7,6 +7,6 @@
%span Page slug
= text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project)
%p.hint
- Please dont use spaces and slashes
+ Please don't use spaces and slashes
.modal-footer
= link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
View Lorry Controller Status