• Mike Greiling's avatar
    Merge branch 'master-ce' into ce-to-ee-2017-07-08 · cd3e8819
    Mike Greiling authored
    * master-ce: (226 commits)
      fix milestones finder failing spec
      Make wrong migrations idempotent
      Remove double border on last group row
      Username and password are no longer stripped from import url on import
      Send Gitaly Repository with /api/internal/allowed
      Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux distros"
      Force mobile view for admin projects
      fix spec
      Mark a subgroup-related spec as PostgreSQL-only
      Add members-list class to admin projects page
      Fix another typo in SHA attribute spec
      fix migrations in the future
      Fix SVG scaling issue
      Fix missing `row` & `container` classes
      Use unless for force_mobile_view
      Fixed GFM references not being included when update issue inline
      move CreatedAtFilter to concerns folder
      fix created_after
      Add git_blob_load_all_data feature flag
      Fix typo in SHA attribute spec
      ...
    
    Conflicts:
    	app/assets/stylesheets/new_sidebar.scss
    	app/assets/stylesheets/pages/issuable.scss
    	app/controllers/projects/milestones_controller.rb
    	app/controllers/projects/variables_controller.rb
    	app/finders/users_finder.rb
    	app/models/ci/variable.rb
    	app/models/issue.rb
    	app/models/milestone.rb
    	app/models/user.rb
    	app/views/ci/variables/_form.html.haml
    	app/views/groups/_settings_head.html.haml
    	app/views/shared/members/_member.html.haml
    	config/application.rb
    	db/schema.rb
    	spec/finders/users_finder_spec.rb
    	spec/requests/api/users_spec.rb
    	spec/services/merge_requests/refresh_service_spec.rb
    cd3e8819
entities.rb 30.9 KB