• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-10-27 · 0e00c169
    Lin Jen-Shin authored
    * upstream/master: (72 commits)
      Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
      Cache commits on the repository model
      Remove groups_select from global namespace & simplifies the code
      Change default disabled merge request widget message to "Merge is not allowed yet"
      Semi-linear history merge is now available in CE.
      Remove repetitive karma spec
      Improve spec to check hidden component
      Rename to shouldShowUsername
      Add KubernetesService#default_namespace tests
      Revert "Merge branch '36670-remove-edit-form' into 'master'"
      Fix bitbucket login
      Remove duped tests
      Add path attribute to WikiFile class
      Make local_branches OPT_OUT
      Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups.
      Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
      Fix the incorrect value being used to set GL_USERNAME on hooks
      Resolve "Remove overzealous tooltips in projects page tabs"
      Fix broken table of content links
      Remove filter icon from search bar
      ...
    0e00c169
environment.rb 6.42 KB