Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6af38f51
Commit
6af38f51
authored
Aug 10, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"Cant" -> "Can't"
parent
6ebd360c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
app/models/project.rb
app/models/project.rb
+2
-2
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+1
-1
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+1
-1
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+1
-1
app/views/merge_requests/show/_mr_accept.html.haml
app/views/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+1
-1
lib/gitlab/gitolite.rb
lib/gitlab/gitolite.rb
+1
-1
No files found.
app/models/project.rb
View file @
6af38f51
...
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
...
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
project
project
rescue
=>
ex
rescue
=>
ex
project
.
error_code
=
:db
project
.
error_code
=
:db
project
.
errors
.
add
(
:base
,
"Cant save project. Please try again later"
)
project
.
errors
.
add
(
:base
,
"Can
'
t save project. Please try again later"
)
project
project
end
end
...
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
...
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
errors
[
:base
]
<<
(
"Your own projects limit is
#{
owner
.
projects_limit
}
! Please contact administrator to increase it"
)
errors
[
:base
]
<<
(
"Your own projects limit is
#{
owner
.
projects_limit
}
! Please contact administrator to increase it"
)
end
end
rescue
rescue
errors
[
:base
]
<<
(
"Cant check your ability to create project"
)
errors
[
:base
]
<<
(
"Can
'
t check your ability to create project"
)
end
end
def
repo_name
def
repo_name
...
...
app/views/errors/encoding.html.haml
View file @
6af38f51
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%h3
Encoding Error
%h3
Encoding Error
%hr
%hr
%p
%p
Page cant be loaded cause of encoding error
Page can
'
t be loaded cause of encoding error
app/views/errors/git_not_found.html.haml
View file @
6af38f51
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%h3
Git Resource Not found
%h3
Git Resource Not found
%hr
%hr
%p
%p
Application cant get access to some
Application can
'
t get access to some
%span
.label
branch
%span
.label
branch
or
or
%span
.label
commit
%span
.label
commit
...
...
app/views/errors/gitolite.html.haml
View file @
6af38f51
.alert-message.block-message.error
.alert-message.block-message.error
%h3
Gitolite Error
%h3
Gitolite Error
%h4
Application cant get access to your gitolite system.
%h4
Application can
'
t get access to your gitolite system.
...
...
app/views/merge_requests/show/_mr_accept.html.haml
View file @
6af38f51
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
%span
%span
=
link_to
"Show how to merge"
,
"#"
,
class:
"how_to_merge_link btn small padded"
,
title:
"How To Merge"
=
link_to
"Show how to merge"
,
"#"
,
class:
"how_to_merge_link btn small padded"
,
title:
"How To Merge"
%strong
This request cant be merged with GitLab. You should do it manually
%strong
This request can
'
t be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.automerge_widget.unchecked
.alert-message
.alert-message
...
...
app/views/snippets/index.html.haml
View file @
6af38f51
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.alert-message.block-message
.alert-message.block-message
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn small add_new right"
,
title:
"New Snippet"
do
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn small add_new right"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
Share code pastes with others if it cant be in a git repository
Share code pastes with others if it can
'
t be in a git repository
%br
%br
To add new snippet - click on button.
To add new snippet - click on button.
...
...
lib/gitlab/gitolite.rb
View file @
6af38f51
...
@@ -137,7 +137,7 @@ module Gitlab
...
@@ -137,7 +137,7 @@ module Gitlab
owner_name
=
repo
.
permissions
[
0
][
"RW+"
][
""
][
0
]
owner_name
=
repo
.
permissions
[
0
][
"RW+"
][
""
][
0
]
raise
StandardError
if
owner_name
.
blank?
raise
StandardError
if
owner_name
.
blank?
rescue
=>
ex
rescue
=>
ex
puts
"Cant determine gitolite-admin owner"
.
red
puts
"Can
'
t determine gitolite-admin owner"
.
red
raise
StandardError
raise
StandardError
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment