Merge pull request #3243 from lyda/misspellings

Result of misspellings run.

Merge pull request #3243 from lyda/misspellings
Result of misspellings run.
Dmitriy Zaporozhets
2 parents a96e0ec5 415bade3
Showing 33 changed files with 43 additions and 43 deletions Show diff stats
app/assets/javascripts/notes.js
app/assets/stylesheets/sections/notes.scss
app/controllers/merge_requests_controller.rb
app/controllers/projects/teams_controller.rb
app/models/gollum_wiki.rb
app/models/note.rb
app/services/git_push_service.rb
app/views/admin/logs/show.html.haml
config/unicorn.rb.example
doc/api/users.md
features/steps/userteams/userteams.rb
features/teams/team.feature
lib/api/users.rb
lib/gitlab/satellite/edit_file_action.rb
lib/tasks/gitlab/task_helpers.rake
spec/requests/api/users_spec.rb
vendor/assets/javascripts/ace-src-noconflict/ace.js
vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js
vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js
vendor/assets/javascripts/ace-src-noconflict/mode-html.js
@@ -327,7 +327,7 @@ var NoteList = {
  
  
   /**
-   * Gets an inital set of notes.
+   * Gets an initial set of notes.
    */
   getContent: function() {
     $.ajax({
@@ -192,7 +192,7 @@ ul.notes {
     }
   }
  
-  // "show" the icon also if we just hover somwhere over the line
+  // "show" the icon also if we just hover somewhere over the line
   &:hover > td {
     background: $hover !important;
  
@@ -128,10 +128,10 @@ class MergeRequestsController &lt; ProjectResourceController
   end
  
   def validates_merge_request
-    # Show git not found page if target branch doesnt exist
+    # Show git not found page if target branch doesn't exist
     return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
  
-    # Show git not found page if source branch doesnt exist
+    # Show git not found page if source branch doesn't exist
     # and there is no saved commits between source & target branch
     return git_not_found! if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
   end
@@ -4,7 +4,7 @@ class Projects::TeamsController &lt; Projects::ApplicationController
     @teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
     @teams = @teams.without_project(project)
     unless @teams.any?
-      redirect_to project_team_index_path(project), notice: "No avaliable teams for assigment."
+      redirect_to project_team_index_path(project), notice: "No available teams for assigment."
     end
   end
  
@@ -47,7 +47,7 @@ class GollumWiki
     wiki.pages.map { |page| WikiPage.new(self, page, true) }
   end
  
-  # Returns the last 30 Commit objects accross the entire
+  # Returns the last 30 Commit objects across the entire
   # repository.
   def recent_history
     Commit.fresh_commits(wiki.repo, 30)
@@ -138,7 +138,7 @@ class Note &lt; ActiveRecord::Base
       super
     end
   # Temp fix to prevent app crash
-  # if note commit id doesnt exist
+  # if note commit id doesn't exist
   rescue
     nil
   end
@@ -97,7 +97,7 @@ class GitPushService
       total_commits_count: push_commits_count
     }
  
-    # For perfomance purposes maximum 20 latest commits
+    # For performance purposes maximum 20 latest commits
     # will be passed as post receive hook data.
     #
     push_commits_limited.each do |commit|
@@ -8,7 +8,7 @@
   %li
     = link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
  
-%p.light To prevent perfomance issues admin logs output the last 2000 lines
+%p.light To prevent performance issues admin logs output the last 2000 lines
 .tab-content
   .tab-pane.active#githost
     .file_holder#README
@@ -30,7 +30,7 @@ end
  
  
 before_fork do |server, worker|
-  # the following is highly recomended for Rails + "preload_app true"
+  # the following is highly recommended for Rails + "preload_app true"
   # as there's no need for the master process to hold a connection
   defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
  
@@ -116,7 +116,7 @@ Parameters:
 + `skype`                             - Skype ID
 + `linkedin`                          - Linkedin
 + `twitter`                           - Twitter account
-+ `projects_limit`                    - Limit projects wich user can create
++ `projects_limit`                    - Limit projects each user can create
 + `extern_uid`                        - External UID
 + `provider`                          - External provider name
 + `bio`                               - User's bio
@@ -210,7 +210,7 @@ class Userteams &lt; Spinach::FeatureSteps
     click_link "Assign Project"
   end
  
-  Then 'I should see form with my own project in avaliable projects list' do
+  Then 'I should see form with my own project in available projects list' do
     projects_select = find("#project_ids")
     projects_select.should have_content(@project.name)
   end
@@ -60,6 +60,6 @@ Feature: UserTeams
     And I have my own project without teams
     And I visit my team page
     When I click on link "Assign Project"
-    Then I should see form with my own project in avaliable projects list
+    Then I should see form with my own project in available projects list
     When I submit form with selected project and max access
     Then I should see my own project in team projects list
@@ -62,7 +62,7 @@ module Gitlab
       #   skype                             - Skype ID
       #   linkedin                          - Linkedin
       #   twitter                           - Twitter account
-      #   projects_limit                    - Limit projects wich user can create
+      #   projects_limit                    - Limit projects each user can create
       #   extern_uid                        - External authentication provider UID
       #   provider                          - External provider
       #   bio                               - Bio
@@ -13,7 +13,7 @@ module Gitlab
       # Updates the files content and creates a new commit for it
       #
       # Returns false if the ref has been updated while editing the file
-      # Returns false if commiting the change fails
+      # Returns false if committing the change fails
       # Returns false if pushing from the satellite to Gitolite failed or was rejected
       # Returns true otherwise
       def commit!(content, commit_message, last_commit)
@@ -38,7 +38,7 @@ namespace :gitlab do
   # Prompt the user to input something
   #
   # message - the message to display before input
-  # choices - array of strings of acceptible answers or nil for any answer
+  # choices - array of strings of acceptable answers or nil for any answer
   #
   # Returns the user's answer
   def prompt(message, choices = nil)
@@ -49,7 +49,7 @@ namespace :gitlab do
     answer
   end
  
-  # Runs the given command and matches the output agains the given pattern
+  # Runs the given command and matches the output against the given pattern
   #
   # Returns nil if nothing matched
   # Retunrs the MatchData if the pattern matched
@@ -300,7 +300,7 @@ describe Gitlab::API do
       response.status.should == 200
     end
  
-    it "should return sucess if key ID not found" do
+    it "should return success if key ID not found" do
       delete api("/user/keys/42", user)
       response.status.should == 200
     end
@@ -4800,7 +4800,7 @@ var SearchHighlight = require(&quot;./search_highlight&quot;).SearchHighlight;
 /**
  * new EditSession(text, mode)
  * - text (Document | String): If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text
- * - mode (TextMode): The inital language mode to use for the document
+ * - mode (TextMode): The initial language mode to use for the document
  *
  * Sets up a new `EditSession` and associates it with the given `Document` and `TextMode`.
  *
@@ -10068,7 +10068,7 @@ ace.define(&#39;ace/token_iterator&#39;, [&#39;require&#39;, &#39;exports&#39;, &#39;module&#39; ], function(req
  * - initialRow (Number): The row to start the tokenizing at
  * - initialColumn (Number): The column to start the tokenizing at
  *
- * Creates a new token iterator object. The inital token index is set to the provided row and column coordinates.
+ * Creates a new token iterator object. The initial token index is set to the provided row and column coordinates.
  *
  **/
 var TokenIterator = function(session, initialRow, initialColumn) {
@@ -11946,7 +11946,7 @@ var VirtualRenderer = function(container, theme) {
         this.$horizScroll = horizScroll;
         if (horizScrollChanged) {
             this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
-            // when we hide scrollbar scroll event isn't emited
+            // when we hide scrollbar scroll event isn't emitted
             // leaving session with wrong scrollLeft value
             if (!horizScroll)
                 this.session.setScrollLeft(0);
@@ -13029,7 +13029,7 @@ var Text = function(parentEl) {
  
             var html = [];
             // Get the tokens per line as there might be some lines in between
-            // beeing folded.
+            // being folded.
             this.$renderLine(html, row, false, row == foldStart ? foldLine : false);
  
             // don't use setInnerHtml since we are working with an empty DIV
@@ -14529,7 +14529,7 @@ var Editor = require(&quot;./editor&quot;).Editor;
      * - dir (Number): The direction of lines to select: -1 for up, 1 for down
      * - skip (Boolean): If `true`, removes the active selection range
      *
-     * Finds the next occurence of text in an active selection and adds it to the selections.
+     * Finds the next occurrence of text in an active selection and adds it to the selections.
      **/
     this.selectMore = function(dir, skip) {
         var session = this.session;
@@ -15878,4 +15878,4 @@ ace.define(&quot;text!ace/theme/textmate.css&quot;, [], &quot;.ace-tm .ace_editor {\n&quot; +
                         ace[key] = a[key];
                 });
             })();
-        
 \ No newline at end of file
+        
@@ -1170,7 +1170,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -337,7 +337,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -389,7 +389,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -659,7 +659,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -338,7 +338,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -342,7 +342,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -597,7 +597,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -641,7 +641,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -466,7 +466,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -2412,4 +2412,4 @@ oop.inherits(LuaHtmlHighlightRules, HtmlHighlightRules);
  
 exports.LuaHtmlHighlightRules = LuaHtmlHighlightRules;
  
-});
 \ No newline at end of file
+});
@@ -382,7 +382,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -2477,4 +2477,4 @@ oop.inherits(LuaPageHighlightRules, HtmlHighlightRules);
  
 exports.LuaPageHighlightRules = LuaPageHighlightRules;
  
-});
 \ No newline at end of file
+});
@@ -384,7 +384,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -1685,7 +1685,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -338,7 +338,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -1177,7 +1177,7 @@ var JavaScriptHighlightRules = function() {
             }
         ],
         // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
+        // makes sure we don't mix up regexps with the division operator
         "regex_allowed": [
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
@@ -2912,7 +2912,7 @@ var JSHINT = (function () {
             immed       : true, // if immediate invocations must be wrapped in parens
             iterator    : true, // if the `__iterator__` property should be allowed
             jquery      : true, // if jQuery globals should be predefined
-            lastsemic   : true, // if semicolons may be ommitted for the trailing
+            lastsemic   : true, // if semicolons may be omitted for the trailing
                                 // statements inside of a one-line blocks.
             latedef     : true, // if the use before definition should not be tolerated
             laxbreak    : true, // if line breaks should not be checked
@@ -3674,7 +3674,7 @@ var JSHINT = (function () {
             line += 1;
  
             // If smarttabs option is used check for spaces followed by tabs only.
-            // Otherwise check for any occurence of mixed tabs and spaces.
+            // Otherwise check for any occurrence of mixed tabs and spaces.
             if (option.smarttabs)
                 at = s.search(/ \t/);
             else
@@ -7609,7 +7609,7 @@ org.antlr.runtime.BaseRecognizer.prototype = {
      *
      *  Until then I'll leave this unimplemented.  If there is enough clamor
      *  it would be possible to keep track of the invocation stack using an
-     *  auxillary array, but that will definitely be a performance hit.
+     *  auxiliary array, but that will definitely be a performance hit.
      */
     getRuleInvocationStack: function(e, recognizerClassName)
     {
...	...	@@ -327,7 +327,7 @@ var NoteList = {
327	327
328	328
329	329	/**
330		- * Gets an inital set of notes.
	330	+ * Gets an initial set of notes.
331	331	*/
332	332	getContent: function() {
333	333	$.ajax({
...	...
...	...	@@ -192,7 +192,7 @@ ul.notes {
192	192	}
193	193	}
194	194
195		- // "show" the icon also if we just hover somwhere over the line
	195	+ // "show" the icon also if we just hover somewhere over the line
196	196	&:hover > td {
197	197	background: $hover !important;
198	198
...	...
...	...	@@ -128,10 +128,10 @@ class MergeRequestsController < ProjectResourceController
128	128	end
129	129
130	130	def validates_merge_request
131		- # Show git not found page if target branch doesnt exist
	131	+ # Show git not found page if target branch doesn't exist
132	132	return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
133	133
134		- # Show git not found page if source branch doesnt exist
	134	+ # Show git not found page if source branch doesn't exist
135	135	# and there is no saved commits between source & target branch
136	136	return git_not_found! if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
137	137	end
...	...
...	...	@@ -4,7 +4,7 @@ class Projects::TeamsController < Projects::ApplicationController
4	4	@teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
5	5	@teams = @teams.without_project(project)
6	6	unless @teams.any?
7		- redirect_to project_team_index_path(project), notice: "No avaliable teams for assigment."
	7	+ redirect_to project_team_index_path(project), notice: "No available teams for assigment."
8	8	end
9	9	end
10	10
...	...
...	...	@@ -47,7 +47,7 @@ class GollumWiki
47	47	wiki.pages.map { \|page\| WikiPage.new(self, page, true) }
48	48	end
49	49
50		- # Returns the last 30 Commit objects accross the entire
	50	+ # Returns the last 30 Commit objects across the entire
51	51	# repository.
52	52	def recent_history
53	53	Commit.fresh_commits(wiki.repo, 30)
...	...
...	...	@@ -138,7 +138,7 @@ class Note < ActiveRecord::Base
138	138	super
139	139	end
140	140	# Temp fix to prevent app crash
141		- # if note commit id doesnt exist
	141	+ # if note commit id doesn't exist
142	142	rescue
143	143	nil
144	144	end
...	...
...	...	@@ -97,7 +97,7 @@ class GitPushService
97	97	total_commits_count: push_commits_count
98	98	}
99	99
100		- # For perfomance purposes maximum 20 latest commits
	100	+ # For performance purposes maximum 20 latest commits
101	101	# will be passed as post receive hook data.
102	102	#
103	103	push_commits_limited.each do \|commit\|
...	...
...	...	@@ -8,7 +8,7 @@
8	8	%li
9	9	= link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
10	10
11		-%p.light To prevent perfomance issues admin logs output the last 2000 lines
	11	+%p.light To prevent performance issues admin logs output the last 2000 lines
12	12	.tab-content
13	13	.tab-pane.active#githost
14	14	.file_holder#README
...	...
...	...	@@ -30,7 +30,7 @@ end
30	30
31	31
32	32	before_fork do \|server, worker\|
33		- # the following is highly recomended for Rails + "preload_app true"
	33	+ # the following is highly recommended for Rails + "preload_app true"
34	34	# as there's no need for the master process to hold a connection
35	35	defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
36	36
...	...
...	...	@@ -116,7 +116,7 @@ Parameters:
116	116	+ `skype` - Skype ID
117	117	+ `linkedin` - Linkedin
118	118	+ `twitter` - Twitter account
119		-+ `projects_limit` - Limit projects wich user can create
	119	++ `projects_limit` - Limit projects each user can create
120	120	+ `extern_uid` - External UID
121	121	+ `provider` - External provider name
122	122	+ `bio` - User's bio
...	...