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
b84ee8d1
Commit
b84ee8d1
authored
Dec 03, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
7c091d70
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
10 deletions
+9
-10
Gemfile
Gemfile
+0
-1
Gemfile.lock
Gemfile.lock
+0
-2
app/controllers/unsubscribes_controller.rb
app/controllers/unsubscribes_controller.rb
+1
-1
app/workers/admin_emails_worker.rb
app/workers/admin_emails_worker.rb
+1
-1
spec/services/issues/bulk_update_service_spec.rb
spec/services/issues/bulk_update_service_spec.rb
+4
-4
spec/services/merge_requests/ff_merge_service_spec.rb
spec/services/merge_requests/ff_merge_service_spec.rb
+3
-1
No files found.
Gemfile
View file @
b84ee8d1
...
...
@@ -132,7 +132,6 @@ gem 'sidetiq', '~> 0.6.3'
gem
"
httparty
"
,
'~> 0.13.3'
# Colored output to console
gem
"
colored
"
,
'~> 1.2'
gem
"
colorize
"
,
'~> 0.7.0'
# GitLab settings
...
...
Gemfile.lock
View file @
b84ee8d1
...
...
@@ -131,7 +131,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colored (1.2)
colorize (0.7.7)
connection_pool (2.2.0)
coveralls (0.8.9)
...
...
@@ -844,7 +843,6 @@ DEPENDENCIES
carrierwave (~> 0.9.0)
charlock_holmes (~> 0.7.3)
coffee-rails (~> 4.1.0)
colored (~> 1.2)
colorize (~> 0.7.0)
coveralls (~> 0.8.2)
creole (~> 0.5.0)
...
...
app/controllers/unsubscribes_controller.rb
View file @
b84ee8d1
...
...
@@ -11,7 +11,7 @@ class UnsubscribesController < ApplicationController
@user
=
get_user
if
@user
@user
.
admin_unsubscribe!
Notify
.
send_unsubscribed_notification
(
@user
).
deliver
Notify
.
send_unsubscribed_notification
(
@user
).
deliver
_later
end
redirect_to
new_user_session_path
,
notice:
'You have been unsubscribed'
end
...
...
app/workers/admin_emails_worker.rb
View file @
b84ee8d1
...
...
@@ -3,7 +3,7 @@ class AdminEmailsWorker
def
perform
(
recipient_id
,
subject
,
body
)
recipient_list
(
recipient_id
).
pluck
(
:id
).
each
do
|
user_id
|
Notify
.
delay
.
send_admin_notification
(
user_id
,
subject
,
body
)
Notify
.
send_admin_notification
(
user_id
,
subject
,
body
).
deliver_later
end
end
...
...
spec/services/issues/bulk_update_service_spec.rb
View file @
b84ee8d1
...
...
@@ -20,7 +20,7 @@ describe Issues::BulkUpdateService do
end
@params
=
{
state_event:
'close'
,
issues_ids:
@issues
.
map
(
&
:id
)
issues_ids:
@issues
.
map
(
&
:id
)
.
join
(
","
)
}
end
...
...
@@ -43,7 +43,7 @@ describe Issues::BulkUpdateService do
end
@params
=
{
state_event:
'reopen'
,
issues_ids:
@issues
.
map
(
&
:id
)
issues_ids:
@issues
.
map
(
&
:id
)
.
join
(
","
)
}
end
...
...
@@ -63,7 +63,7 @@ describe Issues::BulkUpdateService do
before
do
@new_assignee
=
create
:user
@params
=
{
issues_ids:
[
issue
.
id
]
,
issues_ids:
issue
.
id
.
to_s
,
assignee_id:
@new_assignee
.
id
}
end
...
...
@@ -102,7 +102,7 @@ describe Issues::BulkUpdateService do
before
do
@milestone
=
create
:milestone
@params
=
{
issues_ids:
[
issue
.
id
]
,
issues_ids:
issue
.
id
.
to_s
,
milestone_id:
@milestone
.
id
}
end
...
...
spec/services/merge_requests/ff_merge_service_spec.rb
View file @
b84ee8d1
...
...
@@ -23,7 +23,9 @@ describe MergeRequests::FfMergeService do
before
do
allow
(
service
).
to
receive
(
:execute_hooks
)
service
.
execute
(
merge_request
)
perform_enqueued_jobs
do
service
.
execute
(
merge_request
)
end
end
it
"should not create merge commit"
do
...
...
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