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
b8c098ec
Commit
b8c098ec
authored
Apr 07, 2018
by
blackst0ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rb
parent
aade8b36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Gemfile.rails5.lock
Gemfile.rails5.lock
+2
-2
app/services/notification_recipient_service.rb
app/services/notification_recipient_service.rb
+1
-1
No files found.
Gemfile.rails5.lock
View file @
b8c098ec
...
@@ -291,7 +291,7 @@ GEM
...
@@ -291,7 +291,7 @@ GEM
po_to_json (>= 1.0.0)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gherkin-ruby (0.3.2)
gitaly-proto (0.9
1
.0)
gitaly-proto (0.9
4
.0)
google-protobuf (~> 3.1)
google-protobuf (~> 3.1)
grpc (~> 1.0)
grpc (~> 1.0)
github-linguist (5.3.3)
github-linguist (5.3.3)
...
@@ -1062,7 +1062,7 @@ DEPENDENCIES
...
@@ -1062,7 +1062,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.9
1
.0)
gitaly-proto (~> 0.9
4
.0)
github-linguist (~> 5.3.3)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
gitlab-markup (~> 1.6.2)
...
...
app/services/notification_recipient_service.rb
View file @
b8c098ec
...
@@ -51,7 +51,7 @@ module NotificationRecipientService
...
@@ -51,7 +51,7 @@ module NotificationRecipientService
def
add_recipients
(
users
,
type
,
reason
)
def
add_recipients
(
users
,
type
,
reason
)
if
users
.
is_a?
(
ActiveRecord
::
Relation
)
if
users
.
is_a?
(
ActiveRecord
::
Relation
)
users
=
users
.
includes
(
:notification_settings
)
users
=
users
.
includes
(
:notification_settings
)
.
to_a
end
end
users
=
Array
(
users
)
users
=
Array
(
users
)
...
...
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