deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Result of misspellings run.

Browse source 
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.
This commit is contained in:
Kevin Lyda 2013-03-17 19:46:54 +00:00
parent a96e0ec57e
commit 415bade302
33 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/merge_requests_controller.rb
View file

@ -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

2
app/controllers/projects/teams_controller.rb
View file

@ -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