Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fb470e8e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fb470e8e
编写于
1月 07, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Validate username uniq in scope of namespace
上级
a0bd09ab
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
12 deletion
+18
-12
app/models/user.rb
app/models/user.rb
+8
-0
app/views/profiles/account.html.haml
app/views/profiles/account.html.haml
+1
-1
features/steps/project/project_milestones.rb
features/steps/project/project_milestones.rb
+4
-4
lib/tasks/travis.rake
lib/tasks/travis.rake
+5
-7
未找到文件。
app/models/user.rb
浏览文件 @
fb470e8e
...
@@ -67,6 +67,8 @@ class User < ActiveRecord::Base
...
@@ -67,6 +67,8 @@ class User < ActiveRecord::Base
message:
"only letters, digits & '_' '-' '.' allowed. Letter should be first"
}
message:
"only letters, digits & '_' '-' '.' allowed. Letter should be first"
}
validate
:namespace_uniq
,
if:
->
(
user
)
{
user
.
username_changed?
}
before_validation
:generate_password
,
on: :create
before_validation
:generate_password
,
on: :create
before_save
:ensure_authentication_token
before_save
:ensure_authentication_token
alias_attribute
:private_token
,
:authentication_token
alias_attribute
:private_token
,
:authentication_token
...
@@ -135,6 +137,12 @@ class User < ActiveRecord::Base
...
@@ -135,6 +137,12 @@ class User < ActiveRecord::Base
end
end
end
end
def
namespace_uniq
namespace_name
=
self
.
username
if
Namespace
.
find_by_path
(
namespace_name
)
self
.
errors
.
add
:username
,
"already exist"
end
end
# Namespaces user has access to
# Namespaces user has access to
def
namespaces
def
namespaces
...
...
app/views/profiles/account.html.haml
浏览文件 @
fb470e8e
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
%i
.icon-ok
%i
.icon-ok
Saved
Saved
%span
.update-failed.cred.hide
%span
.update-failed.cred.hide
%i
.icon-
ok
%i
.icon-
remove
Failed
Failed
%ul
.cred
%ul
.cred
%li
It will change web url for personal projects.
%li
It will change web url for personal projects.
...
...
features/steps/project/project_milestones.rb
浏览文件 @
fb470e8e
...
@@ -50,12 +50,12 @@ class ProjectMilestones < Spinach::FeatureSteps
...
@@ -50,12 +50,12 @@ class ProjectMilestones < Spinach::FeatureSteps
end
end
Then
"I should see 3 issues"
do
Then
"I should see 3 issues"
do
page
.
should
have_selector
(
'.milestone-issue-filter li'
,
count:
4
)
page
.
should
have_selector
(
'.milestone-issue-filter
.well-list
li'
,
count:
4
)
page
.
should
have_selector
(
'.milestone-issue-filter li.hide'
,
count:
1
)
page
.
should
have_selector
(
'.milestone-issue-filter
.well-list
li.hide'
,
count:
1
)
end
end
Then
"I should see 4 issues"
do
Then
"I should see 4 issues"
do
page
.
should
have_selector
(
'.milestone-issue-filter li'
,
count:
4
)
page
.
should
have_selector
(
'.milestone-issue-filter
.well-list
li'
,
count:
4
)
page
.
should_not
have_selector
(
'.milestone-issue-filter li.hide'
)
page
.
should_not
have_selector
(
'.milestone-issue-filter
.well-list
li.hide'
)
end
end
end
end
lib/tasks/travis.rake
浏览文件 @
fb470e8e
task
:travis
do
desc
"Travis run tests"
[
"rake spinach"
,
"rake spec"
].
each
do
|
cmd
|
task
:travis
=>
[
puts
"Starting to run
#{
cmd
}
..."
:spinach
,
system
(
"export DISPLAY=:99.0 && bundle exec
#{
cmd
}
"
)
:spec
raise
"
#{
cmd
}
failed!"
unless
$?
.
exitstatus
==
0
]
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录