Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into merge-ce-531e4b-to-master

app/assets/javascripts/awards_handler.coffee

 class @AwardsHandler
-  constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
+  constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
     $(".js-add-award").on "click", (event) =>
       event.stopPropagation()
       event.preventDefault()
@@ -34,7 +34,7 @@ class @AwardsHandler
         $("#emoji_search").focus()
     else
       $('.js-add-award').addClass "is-loading"
-      $.get "/emojis", (response) =>
+      $.get @get_emojis_url, (response) =>
         $('.js-add-award').removeClass "is-loading"
         $(".js-award-holder").append response
         setTimeout =>

app/assets/stylesheets/framework/calendar.scss

+.calender-block {
+  @media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
+    overflow-x: scroll;
+  }
+}
+
 .user-calendar-activities {
   .calendar_onclick_hr {
     padding: 0;

app/views/projects/ci/builds/_build.html.haml

@@ -39,7 +39,7 @@
   %td
     = build.name
 
-    .pull-right
+    .label-container
       - if build.tags.any?
         - build.tags.each do |tag|
           %span.label.label-primary

app/views/users/show.html.haml

@@ -87,7 +87,7 @@
   %div{ class: container_class }
     .tab-content
       #activity.tab-pane
-        .gray-content-block.white.second-block
+        .gray-content-block.calender-block.white.second-block.hidden-xs
           %div{ class: container_class }
             .user-calendar{data: {href: user_calendar_path}}
               %h4.center.light

app/views/votes/_votes_block.html.haml

@@ -15,12 +15,14 @@
 
 - if current_user
   :javascript
+    var get_emojis_url = "#{emojis_path}";
     var post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
     var noteable_type = "#{votable.class.name.underscore}";
     var noteable_id = "#{votable.id}";
     var aliases = #{AwardEmoji.aliases.to_json};
 
     window.awards_handler = new AwardsHandler(
+      get_emojis_url,
       post_emoji_url,
       noteable_type,
       noteable_id,

spec/factories/forked_project_links.rb

@@ -13,5 +13,10 @@ FactoryGirl.define do
   factory :forked_project_link do
     association :forked_to_project, factory: :project
     association :forked_from_project, factory: :project
+
+    after(:create) do |link|
+      link.forked_from_project.reload
+      link.forked_to_project.reload
+    end
   end
 end