1. 14 Jul, 2016 9 commits
  2. 13 Jul, 2016 5 commits
  3. 12 Jul, 2016 1 commit
  4. 11 Jul, 2016 4 commits
    • Douwe Maan's avatar
      Merge branch 'ee_adapter_mixin' into 'master' · 174b48e7
      Douwe Maan authored
      Move most of the EE-specific LDAP code to EE-specific classes/modules
      
      This will prevent or reduce merge errors. This doesn't include *all* of the EE-specific LDAP code, but it's the low-hanging fruit. I will get the less-straightforward stuff in a subsequent merge request to avoid making this one unbearably large. 
      
      ## Why is this necessary?
      
      I'm starting work on some of the priority LDAP features/fixes. I was about to start stuffing additional EE-specific methods into `Gitlab::LDAP::Adapter` and it felt like this could be a CE-EE merge danger zone. This seemed like a potentially quick fix to that worry so I thought I'd take a moment to see if it was sane. 
      
      @DouweM and I talked briefly about this. It seems to be the way we want to go in the future anyway so this gets the ball rolling. 
      
      If this goes through and everyone is happy, I'll also create a subsequent merge request to add some development docs about organizing EE code. 
      
      FYI @vsizov @jacobvosmaer-gitlab 
      
      See merge request !511
      174b48e7
    • Douwe Maan's avatar
      Merge branch 'add-license-breakdown' into 'master' · 3c7aaea4
      Douwe Maan authored
      Add license breakdown to admin pages
      
      Screenshots:
      
      At the top of the overview page:
      
      ![image](/uploads/48d489f905b9eee09a3bf038bcf33244/image.png)
      
      At the bottom of the license page:
      
      ![image](/uploads/969caa48e98af4d9afb400b9e5b1b5fd/image.png)
      
      Closes #653
      
      See merge request !516
      3c7aaea4
    • Valery Sizov's avatar
      Merge branch 'remove_unnecessary_jira_issue_class' into 'master' · 46305158
      Valery Sizov authored
      Remove unused JiraIssue class and replace references with ExternalIssue
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/739
      
      This MR can be considered as a fix of wrong CE->EE merge (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4659)
      
      See merge request !545
      46305158
    • Valery Sizov's avatar
  5. 10 Jul, 2016 1 commit
  6. 09 Jul, 2016 11 commits
  7. 08 Jul, 2016 9 commits
    • Dmitriy Zaporozhets's avatar
      3bae69aa
    • Fatih Acet's avatar
      Merge branch 'new-snippet-button-permissions' into 'master' · 697e9889
      Fatih Acet authored
      Update New Snippet buttons.
      
      ## What does this MR do?
      
      No longer shows New Snippet button to users who aren't able to create a new snippet in the given context.
      
      Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Make sure the snippets pages don't break or show the buttons to users who shouldn't have access to them.
      
      ## Why was this MR needed?
      
      Users that weren't logged in would click the New Snippet button and get a 404 error. You would also get 404 errors from the New Snippet button on project snippets for projects you weren't able to create snippets for.
      
      ## What are the relevant issue numbers?
      
      Fixes #14595.
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![before1](/uploads/2c222cd981332d30772054cefadafa28/before1.png)
      
      ![before2](/uploads/2734f8a84ae293b08dd982f2ed7da028/before2.png)
      
      After:
      
      ![after1](/uploads/c84aa9aec17056095271b0f24c6e9b5b/after1.png)
      
      ![after2](/uploads/70fe37ad7be5054bf20439ca0a1f5ccc/after2.png)
      
      ![after3](/uploads/afcd435c211482e9df25cb8971f1e65e/after3.png)
      
      ![after4](/uploads/9eab87440aae4991b508373ff36e3c7a/after4.png)
      
      ![after5](/uploads/f5ec167cb3e1115d3b3a43bd5231bc60/after5.png)
      
      ![after6](/uploads/c774cbb1f9babe3382ff69af7060b9c5/after6.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4998
      697e9889
    • Drew Blessing's avatar
      0a1a4f0a
    • Connor Shea's avatar
      Use btn-danger for delete button. · 226bc587
      Connor Shea authored
      226bc587
    • Connor Shea's avatar
      Update New Snippet buttons. · 443fdff1
      Connor Shea authored
      No longer shows New Snippet button to users who aren't able to create a new snippet in the given context.
      
      Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons.
      
      Fixes #14595.
      443fdff1
    • Fatih Acet's avatar
      Merge branch 'cs-cropper' into 'master' · 57da2e87
      Fatih Acet authored
      Split Cropper.js from the main JavaScript manifest.
      
      ## What does this MR do?
      
      Splits Cropper.js from the main JavaScript file.
      
      ## Are there points in the code the reviewer needs to double check?
      
      That the avatar uploader works. (It did in my testing)
      
      ## Why was this MR needed?
      
      Smaller JS payload.
      
      ## What are the relevant issue numbers?
      
      #14372 
      
      ## Does this MR meet the acceptance criteria?
      
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4978
      57da2e87
    • Rémy Coutable's avatar
      Merge branch 'improve-project-limit-field' into 'master' · 79304c6a
      Rémy Coutable authored
      Add min attribute to projects_limit field on user's form
      
      This PR adds `min=0` attribute to `:projects_limit` field on user's form in the admin panel. It improves UX disallowing user to enter negative values in this field.
      
      ![](http://take.ms/70V8W)
      
      See merge request !3622
      79304c6a
    • Robert Speicher's avatar
      Merge branch 'fix_stale_owner2' into 'master' · b9f09018
      Robert Speicher authored
      Prevent stale data in LDAP group sync last owner check
      
      Representing https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/529
      
      Fixes gitlab-org/gitlab-ce#17764
      
      Turns out that switching to an AR association has resolved the issue. However, a merge problem from CE to EE caused the owners method to not be removed so it took precedence over the association. This removes that method and adds a test to ensure we don't have stale owner data in the future. 
      
      See merge request !531
      b9f09018
    • Rémy Coutable's avatar
      Merge branch 'fix_gemfile' into 'master' · df97d551
      Rémy Coutable authored
      Fix gemfile
      
      1. replace `"` to `'` in Gemfile.
      
      2. change `require: nil` to `require: false`.
      `require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places.
      
      3. set version for gems.
      better gem's version control for prevent dependency errors.
      
      See merge request !5078
      df97d551