Merge pull request #4660 from jojosch/fix-typos

Fix typos

Merge pull request #4660 from jojosch/fix-typos
Fix typos
Jacob Vosmaer
2 parents 5e0e97ec cd19f82e
Showing 38 changed files with 62 additions and 62 deletions Show diff stats
CHANGELOG
app/assets/javascripts/notes.js
app/controllers/admin/users_controller.rb
app/controllers/projects/team_members_controller.rb
app/helpers/application_helper.rb
app/models/namespace.rb
app/models/network/graph.rb
app/models/project.rb
app/models/user.rb
app/models/wiki_page.rb
app/observers/activity_observer.rb
app/services/notification_service.rb
app/views/help/public_access.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/new.html.haml
app/views/projects/wikis/_new.html.haml
doc/api/issues.md
doc/api/projects.md
doc/api/users.md
doc/make_release.md
@@ -4,7 +4,7 @@ v 6.0.0
   - cache project graph
   - Drop support of root namespaces
   - Redesign project settings navigation
-  - Restlyed login screen
+  - Restyled login screen
   - Default theme is classic now
   - Cache result of methods like authorize_projects, project.team.members etc
   - Remove $.ready events
@@ -48,7 +48,7 @@ v 5.3.0
   - Api: added teams api
   - Api: Prevent blob content being escaped
   - Api: Smart deploy key add behaviour
-  - Api: projets/owned.json return user owned project
+  - Api: projects/owned.json return user owned project
   - Fix bug with team assignation on project from #4109
   - Advanced snippets: public/private, project/personal (Andrew Kulakov)
   - Repository Graphs (Karlo Nicholas T. Soriano)
@@ -84,7 +84,7 @@ v 5.2.0
 v 5.1.0
   - You can login with email or username now
   - Corrected project transfer rollback when repository cannot be moved
-  - Move both repo and wiki when project transfer requrested
+  - Move both repo and wiki when project transfer requested
   - Admin area: project editing was removed from admin namespace
   - Access: admin user has now access to any project.
   - Notification settings
@@ -94,7 +94,7 @@ v 5.1.0
   - Restyled Issues list. Show milestone version in issue row
   - Restyled Merge Request list
   - Backup now dump/restore uploads
-  - Improved perfomance of dashboard (Andrew Kumanyaev)
+  - Improved performance of dashboard (Andrew Kumanyaev)
   - File history now tracks renames (Akzhan Abdulin)
   - Drop wiki migration tools
   - Drop sqlite migration tools
@@ -103,7 +103,7 @@ v 5.1.0
   - Restyled network graph (Hiroyuki Sato)
 v 5.0.1
-  - Fixed issue with gitlab-grit being overrided by grit
+  - Fixed issue with gitlab-grit being overridden by grit
 v 5.0.0
   - Replaced gitolite with gitlab-shell
@@ -123,7 +123,7 @@ v 5.0.0
   - Update capybara, rspec-rails, poltergeist to recent versions
   - Wiki on git using Gollum
   - Added Solarized Dark theme for code review
-  - Dont show user emails in autocomplete lists, profile pages
+  - Don't show user emails in autocomplete lists, profile pages
   - Added settings tab for group, team, project
   - Replace user popup with icons in header
   - Handle project moving with gitlab-shell
@@ -176,7 +176,7 @@ v 4.1.0
 v 4.0.0
   - Remove project code and path from API. Use id instead
-  - Return valid clonable url to repo for web hook
+  - Return valid cloneable url to repo for web hook
   - Fixed backup issue
   - Reorganized settings
   - Fixed commits compare
@@ -241,15 +241,15 @@ v 3.0.0
   - Web Editor
   - Fixed bug with gitolite keys
   - UI improved
-  - Increased perfomance of application
+  - Increased performance of application
   - Show user avatar in last commit when browsing Files
   - Refactored Gitlab::Merge
-  - Use Font Awsome for icons
-  - Separate observing of Note and MergeRequestsa
+  - Use Font Awesome for icons
+  - Separate observing of Note and MergeRequests
   - Milestone "All Issues" filter
   - Fix issue close and reopen button text and styles
   - Fix forward/back while browsing Tree hierarchy
-  - Show numer of notes for commits and merge requests
+  - Show number of notes for commits and merge requests
   - Added support pg from box and update installation doc
   - Reject ssh keys that break gitolite
   - [API] list one project hook
@@ -268,7 +268,7 @@ v 2.9.0
   - added factory_girl
   - restyled projects list on dashboard
   - ssh keys validation to prevent gitolite crash
-  - send notifications if changed premission in project
+  - send notifications if changed permission in project
   - scss refactoring. gitlab_bootstrap/ dir
   - fix git push http body bigger than 112k problem
   - list of labels  page under issues tab
@@ -302,7 +302,7 @@ v 2.7.0
   - System hooks
   - UI improved
   - Dashboard events endless scroll
-  - Source perfomance increased
+  - Source performance increased
 v 2.6.0
   - UI polished
@@ -310,7 +310,7 @@ v 2.6.0
   - Handle huge commits
   - Last Push widget
   - Bugfix
-  - Better perfomance
+  - Better performance
   - Email in resque
   - Increased test coverage
   - Ability to remove branch with MR accept
@@ -331,7 +331,7 @@ v 2.4.0
   - Bootstrap 2.0
   - Responsive layout
   - Big commits handling
-  - Perfomance improved
+  - Performance improved
   - Milestones
 v 2.3.1
@@ -411,11 +411,11 @@ v 1.0.2
   - added adv validation for project path & code
   - feature: issues can be sortable
   - bugfix
-  - username dispalyed on top panel
+  - username displayed on top panel
 v 1.0.1
   - fixed: with invalid source code for commit
-  - fixed: lose branch/tag selection when use tree navigateion
+  - fixed: lose branch/tag selection when use tree navigation
   - when history clicked - display path
   - bug fix & code cleaning
@@ -432,11 +432,11 @@ v 0.9.4
   - authorization improved
   - html escaping
   - bug fix
-  - increassed test coverage
+  - increased test coverage
   - design improvements
 v 0.9.1
-  - increassed test coverage
+  - increased test coverage
   - design improvements
   - new issue email notification
   - updated app name
@@ -444,7 +444,7 @@ v 0.9.1
   - issue can be edit
 v 0.8.0
-  - sytax highlight for main file types
+  - syntax highlight for main file types
   - redesign
   - stability
   - security fixes
@@ -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")) {
@@ -24,7 +24,7 @@ class Admin::UsersController &lt; 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 &lt; 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
@@ -49,7 +49,7 @@ class Projects::TeamMembersController &lt; 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
@@ -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
   #
@@ -73,7 +73,7 @@ class Namespace &lt; 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
@@ -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 = {}
@@ -432,7 +432,7 @@ class Project &lt; 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
@@ -155,7 +155,7 @@ class User &lt; 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)
@@ -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
@@ -8,7 +8,7 @@ class ActivityObserver &lt; 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
 # 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
@@ -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}.
@@ -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
@@ -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.
@@ -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'
 ## List issues
-Get all issues created by authenticed user. This function takes pagination parameters
+Get all issues created by authenticated user. This function takes pagination parameters
 `page` and `per_page` to restrict the list of issues.
 ```
@@ -193,7 +193,7 @@ Parameters:
 **Project access levels**
-The project access levels are defined in the `user_project.rb` class. Currently, these levels are recoginized:
+The project access levels are defined in the `user_project.rb` class. Currently, these levels are recognized:
 ```
   GUEST     = 10
@@ -123,7 +123,7 @@ Parameters:
 + `bio`                               - User's bio
 Note, at the moment this method does only return a 404 error, even in cases where a 409 (Conflict) would
-be more appropriate, e.g. when renaming the email address to some exsisting one.
+be more appropriate, e.g. when renaming the email address to some existing one.
 ## User deletion
@@ -8,7 +8,7 @@ NOTE: This is a developer guide. If you are trying to install GitLab see the lat
 ### From x.x to x.x
-#### 0. Any major changes? Database updates? Web server change? File strucuture changes?
+#### 0. Any major changes? Database updates? Web server change? File structure changes?
 #### 1. Make backup
@@ -37,7 +37,7 @@ sudo -u gitlab -H bundle exec rake db:migrate RAILS_ENV=production
 # backup old one
 sudo mv /etc/init.d/gitlab /etc/init.d/gitlab.old
-# get new one usign sidekiq
+# get new one using sidekiq
 sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
@@ -2,7 +2,7 @@
 ## Important changes
-* We dont use `gitlab` user any more. Everything will be moved to `git` user
+* We don't use `gitlab` user any more. Everything will be moved to `git` user
 * __requires ruby1.9.3__
@@ -126,7 +126,7 @@ sudo service nginx restart
 ```
-__7. Start gitlab instace__
+__7. Start gitlab instance__
 ```
@@ -142,7 +142,7 @@ module Gitlab
     # Remove all ssh keys from gitlab shell
     #
     # Ex.
-    #   remmove_all_keys
+    #   remove_all_keys
     #
     def remove_all_keys
       system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "clear"
 module Gitlab
   # This module provide 2 methods
-  # to set specific ENV variabled for GitLab Shell
+  # to set specific ENV variables for GitLab Shell
   module ShellEnv
     extend self
@@ -116,7 +116,7 @@ module Gitlab
         repo.git.fetch({timeout: true}, :origin)
       end
-      # Create directory for stroing
+      # Create directory for storing
       # satellites lock files
       def create_locks_dir
         FileUtils.mkdir_p(lock_files_dir)
@@ -43,7 +43,7 @@ namespace :gitlab do
       end
     end
-    desc "GITLAB | Cleanup | Clean respositories"
+    desc "GITLAB | Cleanup | Clean repositories"
     task repos: :environment  do
       warn_user_is_not_gitlab
       remove_flag = ENV['REMOVE']
@@ -42,7 +42,7 @@ namespace :gitlab do
     username = user.email.match(/^[^@]*/)[0]
     username.gsub!("+", ".")
-    # return username if no mathes
+    # return username if no matches
     return username unless User.find_by_username(username)
     # look for same username
@@ -55,7 +55,7 @@ namespace :gitlab do
   # Runs the given command and matches the output against the given pattern
   #
   # Returns nil if nothing matched
-  # Retunrs the MatchData if the pattern matched
+  # Returns the MatchData if the pattern matched
   #
   # see also #run
   # see also String#match
-desc "GITLAB | Migrate Gropus to match v6.0"
+desc "GITLAB | Migrate Groups to match v6.0"
 task migrate_groups: :environment do
   puts "This will add group owners to group membership"
   ask_to_continue
@@ -287,7 +287,7 @@ describe GitlabMarkdownHelper do
         gfm(":invalid-emoji:").should_not match(/<img/)
       end
-      it "should work independet of reference links (i.e. without @project being set)" do
+      it "should work independent of reference links (i.e. without @project being set)" do
         @project = nil
         gfm(":+1:").should match(/<img/)
       end
@@ -36,7 +36,7 @@ describe Gitlab::Auth do
     end
-    it "should create from auth if user doesnot exist"do
+    it "should create from auth if user does not exist"do
       User.stub find_by_extern_uid_and_provider: nil
       User.stub find_by_email: nil
       gl_auth.should_receive :create_from_omniauth
@@ -45,7 +45,7 @@ describe Issue do
   end
   describe '#is_being_reassigned?' do
-    it 'returnes issues assigned to user' do
+    it 'returns issues assigned to user' do
       user = create :user
       2.times do
@@ -127,11 +127,11 @@ describe Milestone do
       issue = create :issue
     end
-    it 'should be true if milestone active and all nestied issues closed' do
+    it 'should be true if milestone active and all nested issues closed' do
       milestone.can_be_closed?.should be_true
     end
-    it 'should be false if milestone active and not all nestied issues closed' do
+    it 'should be false if milestone active and not all nested issues closed' do
       issue.milestone = milestone
       issue.save
@@ -59,7 +59,7 @@ describe Namespace do
       @namespace.stub(path_changed?: true)
     end
-    it "should raise error when dirtory exists" do
+    it "should raise error when directory exists" do
       expect { @namespace.move_dir }.to raise_error("namespace directory cannot be moved")
     end
@@ -235,7 +235,7 @@ describe Project do
       project.can_have_issues_tracker_id?.should be_false
     end
-    it "should be always false if issues disbled" do
+    it "should be always false if issues disabled" do
       project.issues_enabled = false
       ext_project.issues_enabled = false
@@ -247,7 +247,7 @@ describe API::API do
   end
   describe "GET /user/keys/:id" do
-    it "should returm single key" do
+    it "should return single key" do
       user.keys << key
       user.save
       get api("/user/keys/#{key.id}", user)
-# Select2 ajax programatic helper
+# Select2 ajax programmatic helper
 # It allows you to select value from select2
 #
 # Params
@@ -30,7 +30,7 @@ describe &#39;gitlab:app namespace rake task&#39; do
       let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
-      it 'should fail on mismach' do
+      it 'should fail on mismatch' do
         YAML.stub load_file: {gitlab_version: gitlab_version.reverse}
         expect { run_rake_task }.to raise_error SystemExit
       end
	@@ -177,7 +177,7 @@ var NoteList = {		@@ -177,7 +177,7 @@ var NoteList = {
177	var form = $(this).closest("form");	177	var form = $(this).closest("form");
178	var row = form.closest("tr");	178	var row = form.closest("tr");
179		179
180	- // show the reply button (will only work for replys)	180	+ // show the reply button (will only work for replies)
181	form.prev(".js-discussion-reply-button").show();	181	form.prev(".js-discussion-reply-button").show();
182		182
183	if (row.is(".js-temp-notes-holder")) {	183	if (row.is(".js-temp-notes-holder")) {
	@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ApplicationController		@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ApplicationController
24	if user.block	24	if user.block
25	redirect_to :back, alert: "Successfully blocked"	25	redirect_to :back, alert: "Successfully blocked"
26	else	26	else
27	- redirect_to :back, alert: "Error occured. User was not blocked"	27	+ redirect_to :back, alert: "Error occurred. User was not blocked"
28	end	28	end
29	end	29	end
30		30
	@@ -32,7 +32,7 @@ class Admin::UsersController < Admin::ApplicationController		@@ -32,7 +32,7 @@ class Admin::UsersController < Admin::ApplicationController
32	if user.activate	32	if user.activate
33	redirect_to :back, alert: "Successfully unblocked"	33	redirect_to :back, alert: "Successfully unblocked"
34	else	34	else
35	- redirect_to :back, alert: "Error occured. User was not unblocked"	35	+ redirect_to :back, alert: "Error occurred. User was not unblocked"
36	end	36	end
37	end	37	end
38		38
	@@ -49,7 +49,7 @@ class Projects::TeamMembersController < Projects::ApplicationController		@@ -49,7 +49,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
49	def apply_import	49	def apply_import
50	giver = Project.find(params[:source_project_id])	50	giver = Project.find(params[:source_project_id])
51	status = @project.team.import(giver)	51	status = @project.team.import(giver)
52	- notice = status ? "Succesfully imported" : "Import failed"	52	+ notice = status ? "Successfully imported" : "Import failed"
53		53
54	redirect_to project_team_index_path(project), notice: notice	54	redirect_to project_team_index_path(project), notice: notice
55	end	55	end
	@@ -35,7 +35,7 @@ module ApplicationHelper		@@ -35,7 +35,7 @@ module ApplicationHelper
35	args.any? { \|v\| v.to_s.downcase == controller.controller_name }	35	args.any? { \|v\| v.to_s.downcase == controller.controller_name }
36	end	36	end
37		37
38	- # Check if a partcular action is the current one	38	+ # Check if a particular action is the current one
39	#	39	#
40	# args - One or more action names to check	40	# args - One or more action names to check
41	#	41	#
	@@ -73,7 +73,7 @@ class Namespace < ActiveRecord::Base		@@ -73,7 +73,7 @@ class Namespace < ActiveRecord::Base
73	gitlab_shell.rm_satellites(path_was)	73	gitlab_shell.rm_satellites(path_was)
74	send_update_instructions	74	send_update_instructions
75	rescue	75	rescue
76	- # Returning false does not rolback after_* transaction but gives	76	+ # Returning false does not rollback after_* transaction but gives
77	# us information about failing some of tasks	77	# us information about failing some of tasks
78	false	78	false
79	end	79	end
	@@ -43,9 +43,9 @@ module Network		@@ -43,9 +43,9 @@ module Network
43		43
44	# Method is adding time and space on the	44	# Method is adding time and space on the
45	# list of commits. As well as returns date list	45	# list of commits. As well as returns date list
46	- # corelated with time set on commits.	46	+ # correlated with time set on commits.
47	#	47	#
48	- # @return [Array<TimeDate>] list of commit dates corelated with time on commits	48	+ # @return [Array<TimeDate>] list of commit dates correlated with time on commits
49	def index_commits	49	def index_commits
50	days = []	50	days = []
51	@map = {}	51	@map = {}
	@@ -432,7 +432,7 @@ class Project < ActiveRecord::Base		@@ -432,7 +432,7 @@ class Project < ActiveRecord::Base
432	gitlab_shell.rm_satellites(old_path_with_namespace)	432	gitlab_shell.rm_satellites(old_path_with_namespace)
433	send_move_instructions	433	send_move_instructions
434	rescue	434	rescue
435	- # Returning false does not rolback after_* transaction but gives	435	+ # Returning false does not rollback after_* transaction but gives
436	# us information about failing some of tasks	436	# us information about failing some of tasks
437	false	437	false
438	end	438	end
	@@ -155,7 +155,7 @@ class User < ActiveRecord::Base		@@ -155,7 +155,7 @@ class User < ActiveRecord::Base
155	# Class methods	155	# Class methods
156	#	156	#
157	class << self	157	class << self
158	- # Devise method overriden to allow sing in with email or username	158	+ # Devise method overridden to allow sing in with email or username
159	def find_for_database_authentication(warden_conditions)	159	def find_for_database_authentication(warden_conditions)
160	conditions = warden_conditions.dup	160	conditions = warden_conditions.dup
161	if login = conditions.delete(:login)	161	if login = conditions.delete(:login)
	@@ -143,7 +143,7 @@ class WikiPage		@@ -143,7 +143,7 @@ class WikiPage
143	save :update_page, @page, content, format, message	143	save :update_page, @page, content, format, message
144	end	144	end
145		145
146	- # Destroys the WIki Page.	146	+ # Destroys the Wiki Page.
147	#	147	#
148	# Returns boolean True or False.	148	# Returns boolean True or False.
149	def delete	149	def delete
	@@ -8,7 +8,7 @@ class ActivityObserver < BaseObserver		@@ -8,7 +8,7 @@ class ActivityObserver < BaseObserver
8	# Skip system status notes like 'status changed to close'	8	# Skip system status notes like 'status changed to close'
9	return true if record.note.include?("_Status changed to ")	9	return true if record.note.include?("_Status changed to ")
10		10
11	- # Skip wall notes to prevent spaming of dashboard	11	+ # Skip wall notes to prevent spamming of dashboard
12	return true if record.noteable_type.blank?	12	return true if record.noteable_type.blank?
13	end	13	end
14		14