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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
162cd009
Commit
162cd009
authored
Dec 03, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix deprecation messages in tests
parent
e6dadea3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
10 deletions
+12
-10
app/models/project_services/buildkite_service.rb
app/models/project_services/buildkite_service.rb
+1
-1
app/models/project_services/drone_ci_service.rb
app/models/project_services/drone_ci_service.rb
+1
-1
app/models/user.rb
app/models/user.rb
+1
-1
app/views/ci/notify/build_fail_email.html.haml
app/views/ci/notify/build_fail_email.html.haml
+1
-1
lib/gitlab/lfs/response.rb
lib/gitlab/lfs/response.rb
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+7
-5
No files found.
app/models/project_services/buildkite_service.rb
View file @
162cd009
...
@@ -37,7 +37,7 @@ class BuildkiteService < CiService
...
@@ -37,7 +37,7 @@ class BuildkiteService < CiService
def
compose_service_hook
def
compose_service_hook
hook
=
service_hook
||
build_service_hook
hook
=
service_hook
||
build_service_hook
hook
.
url
=
webhook_url
hook
.
url
=
webhook_url
hook
.
enable_ssl_verification
=
enable_ssl_verification
hook
.
enable_ssl_verification
=
!!
enable_ssl_verification
hook
.
save
hook
.
save
end
end
...
...
app/models/project_services/drone_ci_service.rb
View file @
162cd009
...
@@ -34,7 +34,7 @@ class DroneCiService < CiService
...
@@ -34,7 +34,7 @@ class DroneCiService < CiService
hook
=
service_hook
||
build_service_hook
hook
=
service_hook
||
build_service_hook
# If using a service template, project may not be available
# If using a service template, project may not be available
hook
.
url
=
[
drone_url
,
"/api/hook"
,
"?owner=
#{
project
.
namespace
.
path
}
"
,
"&name=
#{
project
.
path
}
"
,
"&access_token=
#{
token
}
"
].
join
if
project
hook
.
url
=
[
drone_url
,
"/api/hook"
,
"?owner=
#{
project
.
namespace
.
path
}
"
,
"&name=
#{
project
.
path
}
"
,
"&access_token=
#{
token
}
"
].
join
if
project
hook
.
enable_ssl_verification
=
enable_ssl_verification
hook
.
enable_ssl_verification
=
!!
enable_ssl_verification
hook
.
save
hook
.
save
end
end
...
...
app/models/user.rb
View file @
162cd009
...
@@ -690,7 +690,7 @@ class User < ActiveRecord::Base
...
@@ -690,7 +690,7 @@ class User < ActiveRecord::Base
end
end
def
starred?
(
project
)
def
starred?
(
project
)
starred_projects
.
exists?
(
project
)
starred_projects
.
exists?
(
project
.
id
)
end
end
def
toggle_star
(
project
)
def
toggle_star
(
project
)
...
...
app/views/ci/notify/build_fail_email.html.haml
View file @
162cd009
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
@project
.
name
=
@project
.
name
%p
%p
Commit:
#{
link_to
@build
.
short_sha
,
namespace_project_commit_
path
(
@build
.
gl_project
.
namespace
,
@build
.
gl_project
,
@build
.
sha
)
}
Commit:
#{
link_to
@build
.
short_sha
,
namespace_project_commit_
url
(
@build
.
gl_project
.
namespace
,
@build
.
gl_project
,
@build
.
sha
)
}
%p
%p
Author:
#{
@build
.
commit
.
git_author_name
}
Author:
#{
@build
.
commit
.
git_author_name
}
%p
%p
...
...
lib/gitlab/lfs/response.rb
View file @
162cd009
...
@@ -260,7 +260,7 @@ module Gitlab
...
@@ -260,7 +260,7 @@ module Gitlab
end
end
def
link_to_project
(
object
)
def
link_to_project
(
object
)
if
object
&&
!
object
.
projects
.
exists?
(
@project
)
if
object
&&
!
object
.
projects
.
exists?
(
@project
.
id
)
object
.
projects
<<
@project
object
.
projects
<<
@project
object
.
save
object
.
save
end
end
...
...
spec/mailers/notify_spec.rb
View file @
162cd009
...
@@ -247,7 +247,7 @@ describe Notify do
...
@@ -247,7 +247,7 @@ describe Notify do
end
end
describe
'that have been reassigned'
do
describe
'that have been reassigned'
do
subject
{
Notify
.
reassigned_issue_email
(
recipient
.
id
,
issue
.
id
,
previous_assignee
.
id
,
current_user
)
}
subject
{
Notify
.
reassigned_issue_email
(
recipient
.
id
,
issue
.
id
,
previous_assignee
.
id
,
current_user
.
id
)
}
it_behaves_like
'a multiple recipients email'
it_behaves_like
'a multiple recipients email'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'an answer to an existing thread'
,
'issue'
...
@@ -278,7 +278,7 @@ describe Notify do
...
@@ -278,7 +278,7 @@ describe Notify do
describe
'status changed'
do
describe
'status changed'
do
let
(
:status
)
{
'closed'
}
let
(
:status
)
{
'closed'
}
subject
{
Notify
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
)
}
subject
{
Notify
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
.
id
)
}
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'it should show Gmail Actions View Issue link'
...
@@ -382,7 +382,7 @@ describe Notify do
...
@@ -382,7 +382,7 @@ describe Notify do
describe
'status changed'
do
describe
'status changed'
do
let
(
:status
)
{
'reopened'
}
let
(
:status
)
{
'reopened'
}
subject
{
Notify
.
merge_request_status_email
(
recipient
.
id
,
merge_request
.
id
,
status
,
current_user
)
}
subject
{
Notify
.
merge_request_status_email
(
recipient
.
id
,
merge_request
.
id
,
status
,
current_user
.
id
)
}
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
...
@@ -597,8 +597,10 @@ describe Notify do
...
@@ -597,8 +597,10 @@ describe Notify do
let
(
:user
)
{
create
(
:user
,
email:
'old-email@mail.com'
)
}
let
(
:user
)
{
create
(
:user
,
email:
'old-email@mail.com'
)
}
before
do
before
do
user
.
email
=
"new-email@mail.com"
perform_enqueued_jobs
do
user
.
save
user
.
email
=
"new-email@mail.com"
user
.
save
end
end
end
subject
{
ActionMailer
::
Base
.
deliveries
.
last
}
subject
{
ActionMailer
::
Base
.
deliveries
.
last
}
...
...
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