Fix conflicts in group and project member views

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Gemfile.lock

@@ -146,6 +146,7 @@ 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)
@@ -197,6 +198,8 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     encryptor (1.3.0)
+    enumerize (0.7.0)
+      activesupport (>= 3.2)
     equalizer (0.0.11)
     erubis (2.7.0)
     escape_utils (1.1.0)
@@ -856,6 +859,7 @@ 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)
@@ -870,6 +874,7 @@ DEPENDENCIES
   dropzonejs-rails (~> 0.7.1)
   email_reply_parser (~> 0.5.8)
   email_spec (~> 1.6.0)
+  enumerize (~> 0.7.0)
   factory_girl_rails (~> 4.3.0)
   ffaker (~> 2.0.0)
   flay

app/models/historical_data.rb

 class HistoricalData < ActiveRecord::Base
-  validate :date, presence: true
+  validates :date, presence: true
 
   # HistoricalData.during((Date.today - 1.year)..Date.today).average(:active_user_count)
   scope :during, ->(range) { where(date: range) }

app/views/groups/group_members/index.html.haml

@@ -3,57 +3,24 @@
 - @blank_container = true
 
 .group-members-page
-  - if current_user && current_user.can?(:admin_group_member, @group)
-<<<<<<< HEAD
-    .pull-right
-      - if @group.ldap_synced?
+  - if @group.ldap_synced?
+    .bs-callout.bs-callout-info
+      The members of this group are managed using LDAP and cannot be added, changed or removed here.
+      Because LDAP permissions in GitLab get updated one user at a time and because GitLab caches LDAP check results, changes on your LDAP server or in this group's LDAP sync settings may take up to #{Gitlab.config.ldap['sync_time']}s to show in the list below.
+      %ul
+        - @group.ldap_group_links.each do |ldap_group_link|
+          %li
+            People in cn
+            %code= ldap_group_link.cn
+            are given
+            %code= ldap_group_link.human_access
+            access.
+      - if current_user && current_user.can?(:admin_group, @group)
         = form_tag(reset_access_group_ldap_path(@group), method: :put, class: 'inline') do
           = button_to 'Clear LDAP permission cache', '#', class: "btn btn-remove js-confirm-danger",
             data: { "confirm-danger-message" => clear_ldap_permission_cache_message,
                     'warning-message' => 'If you made manual permission tweaks for some group members they will be lost.' }
 
-      = button_tag class: 'btn btn-new js-toggle-button', type: 'button' do
-        Add members
-        %i.fa.fa-chevron-down
-
-    .js-toggle-content.hide.new-group-member-holder
-      = render "new_group_member"
-
-- if @group.ldap_synced?
-  .bs-callout.bs-callout-info
-    The members of this group are managed using LDAP and cannot be added, changed or removed here.
-    Because LDAP permissions in GitLab get updated one user at a time and because GitLab caches LDAP check results, changes on your LDAP server or in this group's LDAP sync settings may take up to #{Gitlab.config.ldap['sync_time']}s to show in the list below.
-    %ul
-      - @group.ldap_group_links.each do |ldap_group_link|
-        %li
-          People in cn
-          %code= ldap_group_link.cn
-          are given
-          %code= ldap_group_link.human_access
-          access.
-
-.panel.panel-default.prepend-top-20
-  .panel-heading
-    %strong #{@group.name}
-    group members
-    %small
-      (#{@members.total_count})
-  %ul.well-list
-    - @members.each do |member|
-      = render 'groups/group_members/group_member', member: member, show_controls: true
-
-= paginate @members, theme: 'gitlab'
-= render 'shared/confirm_modal', phrase: 'reset'
-=======
-    .panel.panel-default
-      .panel-heading
-        Add new user to group
-      .panel-body
-        - if should_user_see_group_roles?(current_user, @group)
-          %p.light
-            Members of group have access to all group projects.
-        .new-group-member-holder
-          = render "new_group_member"
 
   .panel.panel-default
     .panel-heading
@@ -71,10 +38,11 @@
       - @members.each do |member|
         = render 'groups/group_members/group_member', member: member, show_controls: true
     = paginate @members, theme: 'gitlab'
->>>>>>> origin/master
 
 :javascript
   $('form.member-search-form').on('submit', function(event) {
     event.preventDefault();
     Turbolinks.visit(this.action + '?' + $(this).serialize());
   });
+
+= render 'shared/confirm_modal', phrase: 'reset'

app/views/ldap_group_links/_ldap_group_link.html.haml

@@ -5,10 +5,10 @@
   %strong= ldap_group_link.cn
 
   - if ldap_group_link.config
-    %p.light
+    .light
       As #{ldap_group_link.human_access} on #{ldap_group_link.provider_label} server
   - else
-    %p.cred
+    .cred
       %i.fa.fa-warning
       Config for
       %code #{ldap_group_link.provider}

app/views/projects/project_members/_shared_group_members.html.haml

@@ -13,7 +13,7 @@
           = link_to group_group_members_path(shared_group), class: 'btn btn-sm' do
             %i.fa.fa-pencil-square-o
             Edit group members
-    %ul.well-list
+    %ul.content-list
       - shared_group.group_members.order('access_level DESC').limit(20).each do |member|
         = render 'groups/group_members/group_member', member: member, show_controls: false, show_roles: false
       - if shared_group_users_count > 20

app/views/projects/project_members/index.html.haml

@@ -2,43 +2,12 @@
 = render "header_title"
 - @blank_container = true
 
-<<<<<<< HEAD
-.gray-content-block.top-block
-  .clearfix.js-toggle-container
-    = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
-      .form-group
-        = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input', spellcheck: false }
-      = button_tag 'Search', class: 'btn'
-
-    - if can?(current_user, :admin_project_member, @project) && !membership_locked?
-      %span.pull-right
-        = button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
-          Add members
-          %i.fa.fa-chevron-down
-        = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
-          Import members
-
-      .js-toggle-content.hide.new-group-member-holder
-        = render "new_project_member"
-
-%p.prepend-top-default.light
-  Users with access to this project are listed below.
-  Read more about project permissions
-  %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
-
 - if membership_locked?
-  %p.text-warning
+  .alert.alert-warning
     Adding new users is disabled at group level
 
-= render "team", members: @project_members
-
-- if @group
-  = render "group_members", members: @group_members
-- if @project_group_links.any? && @project.allowed_to_share_with_group?
-  = render "shared_group_members"
-=======
 .project-members-page
-  - if can?(current_user, :admin_project_member, @project)
+  - if can?(current_user, :admin_project_member, @project) && !membership_locked?
     .panel.panel-default
       .panel-heading
         Add new user to project
@@ -51,7 +20,9 @@
         = render "new_project_member"
 
   = render "team", members: @project_members
->>>>>>> origin/master
 
   - if @group
     = render "group_members", members: @group_members
+
+  - if @project_group_links.any? && @project.allowed_to_share_with_group?
+    = render "shared_group_members"