From 415bade302d6c3eef5810c7b812a8f608ef43001 Mon Sep 17 00:00:00 2001 From: Kevin Lyda Date: Sun, 17 Mar 2013 19:46:54 +0000 Subject: [PATCH] Result of misspellings run. Most of these are comments but a few are strings for users. Might be an idea to run this from time to time: https://github.com/lyda/misspell-check It runs mostly clean now. --- app/assets/javascripts/notes.js | 2 +- app/assets/stylesheets/sections/notes.scss | 2 +- app/controllers/merge_requests_controller.rb | 4 ++-- app/controllers/projects/teams_controller.rb | 2 +- app/models/gollum_wiki.rb | 2 +- app/models/note.rb | 2 +- app/services/git_push_service.rb | 2 +- app/views/admin/logs/show.html.haml | 2 +- config/unicorn.rb.example | 2 +- doc/api/users.md | 2 +- features/steps/userteams/userteams.rb | 2 +- features/teams/team.feature | 2 +- lib/api/users.rb | 2 +- lib/gitlab/satellite/edit_file_action.rb | 2 +- lib/tasks/gitlab/task_helpers.rake | 4 ++-- spec/requests/api/users_spec.rb | 2 +- vendor/assets/javascripts/ace-src-noconflict/ace.js | 12 ++++++------ .../ace-src-noconflict/mode-coldfusion.js | 2 +- .../javascripts/ace-src-noconflict/mode-groovy.js | 2 +- .../javascripts/ace-src-noconflict/mode-html.js | 2 +- .../javascripts/ace-src-noconflict/mode-jade.js | 2 +- .../javascripts/ace-src-noconflict/mode-java.js | 2 +- .../ace-src-noconflict/mode-javascript.js | 2 +- .../javascripts/ace-src-noconflict/mode-jsp.js | 2 +- .../javascripts/ace-src-noconflict/mode-liquid.js | 2 +- .../javascripts/ace-src-noconflict/mode-luahtml.js | 4 ++-- .../javascripts/ace-src-noconflict/mode-luapage.js | 4 ++-- .../javascripts/ace-src-noconflict/mode-markdown.js | 2 +- .../javascripts/ace-src-noconflict/mode-php.js | 2 +- .../javascripts/ace-src-noconflict/mode-scala.js | 2 +- .../javascripts/ace-src-noconflict/mode-svg.js | 2 +- .../ace-src-noconflict/worker-javascript.js | 4 ++-- .../javascripts/ace-src-noconflict/worker-xquery.js | 2 +- 33 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 919c6b7f4a2..4333d823178 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -327,7 +327,7 @@ var NoteList = { /** - * Gets an inital set of notes. + * Gets an initial set of notes. */ getContent: function() { $.ajax({ diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 98c4fd3b81e..4a6d114c306 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -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; diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 788f2c3a5cd..ebd48036c38 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -128,10 +128,10 @@ class MergeRequestsController < 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 diff --git a/app/controllers/projects/teams_controller.rb b/app/controllers/projects/teams_controller.rb index 3ca724aaf4d..17e7367364a 100644 --- a/app/controllers/projects/teams_controller.rb +++ b/app/controllers/projects/teams_controller.rb @@ -4,7 +4,7 @@ class Projects::TeamsController < 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 diff --git a/app/models/gollum_wiki.rb b/app/models/gollum_wiki.rb index 95326505365..a1ee3a0899a 100644 --- a/app/models/gollum_wiki.rb +++ b/app/models/gollum_wiki.rb @@ -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) diff --git a/app/models/note.rb b/app/models/note.rb index 97f6bf6e3a7..f56f999fda1 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -138,7 +138,7 @@ class Note < 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 diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index d0b3dd557a1..383e6398b74 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -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| diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml index 9ddd781c6ec..fef72186b2f 100644 --- a/app/views/admin/logs/show.html.haml +++ b/app/views/admin/logs/show.html.haml @@ -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 diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 123033486f4..75945182806 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -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! diff --git a/doc/api/users.md b/doc/api/users.md index dc31c10eb9d..70a2449f2e1 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -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 diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb index 11a66b6646f..70ad3cca43a 100644 --- a/features/steps/userteams/userteams.rb +++ b/features/steps/userteams/userteams.rb @@ -210,7 +210,7 @@ class Userteams < 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 diff --git a/features/teams/team.feature b/features/teams/team.feature index 1ae1812633e..ac34ed76f04 100644 --- a/features/teams/team.feature +++ b/features/teams/team.feature @@ -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 diff --git a/lib/api/users.rb b/lib/api/users.rb index 1462e7b4c1d..e9cf16fa37d 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -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 diff --git a/lib/gitlab/satellite/edit_file_action.rb b/lib/gitlab/satellite/edit_file_action.rb index e9053f904c0..07570965b1a 100644 --- a/lib/gitlab/satellite/edit_file_action.rb +++ b/lib/gitlab/satellite/edit_file_action.rb @@ -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) diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index cb4e34cc0d7..cfab3670fb2 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -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 diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index c2c9f8465b8..749769d45c2 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -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 diff --git a/vendor/assets/javascripts/ace-src-noconflict/ace.js b/vendor/assets/javascripts/ace-src-noconflict/ace.js index 11b4bbb8da3..8bd2d9a6051 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/ace.js +++ b/vendor/assets/javascripts/ace-src-noconflict/ace.js @@ -4800,7 +4800,7 @@ var SearchHighlight = require("./search_highlight").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('ace/token_iterator', ['require', 'exports', 'module' ], 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("./editor").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("text!ace/theme/textmate.css", [], ".ace-tm .ace_editor {\n" + ace[key] = a[key]; }); })(); - \ No newline at end of file + diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js b/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js index 1b41d001a25..aea4214560e 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js b/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js index ad7bdf58855..80d153d8fbd 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-html.js b/vendor/assets/javascripts/ace-src-noconflict/mode-html.js index 0ea36845d75..5ec11f141c0 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-html.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-html.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js b/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js index c01a359835a..32aafd17c9e 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-java.js b/vendor/assets/javascripts/ace-src-noconflict/mode-java.js index 23f9e60396b..c05bf0f9e75 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-java.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-java.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js b/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js index d266bffb19a..90cf57eb5f4 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js b/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js index c96d25e936e..e4f4bcffed3 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js b/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js index 2623396ca0a..3886e739ba4 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js b/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js index 89bc2ec783f..d8a1b653f3d 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js @@ -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 +}); diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js b/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js index 8f03866ddaf..9be136de978 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js @@ -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 +}); diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js b/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js index 179376aa403..e1c269eefc2 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-php.js b/vendor/assets/javascripts/ace-src-noconflict/mode-php.js index d3deefc6618..40710ceef20 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-php.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-php.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js b/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js index ee8ebb8fc0c..87b8e12b8e0 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js b/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js index 29c2b17bdd3..96b965ba112 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js @@ -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"), { diff --git a/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js b/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js index 923bac6f661..671d7bec547 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js +++ b/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js @@ -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 diff --git a/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js b/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js index 494066fd73f..1d8c512ee77 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js +++ b/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js @@ -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) {