diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 2 | ||||
| -rw-r--r-- | app/controllers/merge_requests_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/teams_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/gollum_wiki.rb | 2 | ||||
| -rw-r--r-- | app/models/note.rb | 2 | ||||
| -rw-r--r-- | app/services/git_push_service.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/logs/show.html.haml | 2 |
8 files changed, 9 insertions, 9 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 |