[ifmeorg#1713] Resolved merge conflicts

app/controllers/moments_controller.rb

@@ -26,11 +26,6 @@ def index
   def show
     show_with_comments(@moment)
     @resources = ResourceRecommendations.new(@moment).call
-    # @matched_tags = ResourceRecommendations.new(@moment).matched_tags
-    # @filter_tags = @matched_tags.uniq.map do |t|
-    #   "filter[]=#{t}&"
-    # end
-    # @filter_tags = @filter_tags.join
     @resources_tags = resources_url_tags
   end
 

app/views/moments/show.html.erb

@@ -47,7 +47,7 @@
 <div class="smallMarginTop">
   <div class="label"><%= label_tag "What resources could help?" %> </div>
   <ul>
-    <% @resources.each do |item|  %>
+    <% @resources.take(3).each do |item|  %>
       <li><%= link_to item['name'], item['link'] %></li>
     <%end %>
     <li><%= link_to  'More...', "/resources?#{@resources_tags}" %></li>

spec/services/moment_keywords_spec.rb

@@ -16,7 +16,7 @@
   it 'downcases words' do
     expect(keywords).to include('addiction')
   end
-  
+
   it 'removes special characters' do
     expect(keywords).to include('teachers')
   end

spec/services/resource_recommendations_spec.rb

@@ -3,9 +3,9 @@
                                        name: 'SELF-INJURY@',
                                        why: 'text',
                                        fix: 'text' )}
-  
+
     subject(:resources) { ResourceRecommendations.new(moment).call}
-  
+
     describe 'A test for resources method from ResourceRecommendations class' do
       it 'returns recommended resources based on moment keywords' do
         available_resource = [{'tags'=> ["self_injury"]}]
@@ -18,4 +18,4 @@
         expect(resources).not_to eq(available_resource2)
       end
     end
-  end
+  end