1. 05 Oct, 2016 1 commit
  2. 04 Oct, 2016 1 commit
  3. 29 Sep, 2016 2 commits
  4. 28 Sep, 2016 2 commits
    • Ruben Davila's avatar
      Fix CHANGELOG-EE. · 576078e8
      Ruben Davila authored
      576078e8
    • Jacob Schatz's avatar
      Merge branch '22020-fix-form-submit-missing-url' into 'master' · dd406a71
      Jacob Schatz authored
      Add missing url param to ajax call
      
      The `url` param was missing from the ajax call.
      
      This bug happened because the `url` param was not set. jQuery defaults to `location.href`. BUT if the user came to the protected branches page from another page a previously set `ajaxSettings.url` was used as default url (which defaults to `location.href`) so when the user submitted the form the request was made to a  completely wrong `url`. Refreshing the page was working because `ajaxSettings.url` was set to the current page'`location.href` and that was the correct URL.
      
      This MR ensures the url will always be set with the right one.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22020
      
      See merge request !760
      dd406a71
  5. 26 Sep, 2016 2 commits
  6. 24 Sep, 2016 1 commit
  7. 23 Sep, 2016 2 commits
  8. 22 Sep, 2016 1 commit
  9. 21 Sep, 2016 4 commits
    • Douwe Maan's avatar
      Merge branch 'repository-size-restrictions' into 'master' · a2c1856e
      Douwe Maan authored
      Enforce repository size limit across all projects and groups, includes LFS objects in that limit.
      
      Limit can be set globally, and overridden per group, and/or project.
      
      Backend functionality is there and comprehensive tests are included, but there is still some frontend work to be done and documentation to be added. I'm submitting early for review as we are close to the release.
      
      @DouweM @dbalexandre I'd appreciate it if you both could start with the review while I finish the documentation and the missing frontend parts.
      
      /cc @JobV @regisF 
      
      Fixes #559
      
      Replaces gitlab-org/gitlab-ce!6020
      
      ## Screenshots (see gitlab-org/gitlab-ce!6020 for more)
      
      ![Screen_Shot_2016-09-18_at_9.55.38_PM](/uploads/66eeaced1f27c7e2115feaa4775a6e99/Screen_Shot_2016-09-18_at_9.55.38_PM.png)
      
      ![Screen_Shot_2016-09-18_at_9.57.12_PM](/uploads/d811d6c184044df527bd2f81cff651ce/Screen_Shot_2016-09-18_at_9.57.12_PM.png)
      
      ![Screen_Shot_2016-09-18_at_9.58.03_PM](/uploads/a2c5b2695454dda639537304a1bcd99b/Screen_Shot_2016-09-18_at_9.58.03_PM.png)
      
      ![Screen_Shot_2016-09-19_at_1.44.19_PM](/uploads/4cc6cca7536787bde49c0b086086cbcb/Screen_Shot_2016-09-19_at_1.44.19_PM.png)
      
      See merge request !740
      a2c1856e
    • Douwe Maan's avatar
      Merge branch 'ad_recursive' into 'master' · 3b190a11
      Douwe Maan authored
      Active Directory ranged member retrieval
      
      Related to gitlab-org/gitlab-ee!422
      
      See merge request !719
      3b190a11
    • Rémy Coutable's avatar
      a2485840
    • Drew Blessing's avatar
      Ranged members · 7e2674d1
      Drew Blessing authored
      7e2674d1
  10. 20 Sep, 2016 3 commits
    • Robert Speicher's avatar
      Merge branch 'sh-improve-ee-usage-ping' into 'master' · 941f7598
      Robert Speicher authored
      Add more usage data to EE ping
      
      This MR loads the EE usage ping asynchronously on the admin application settings page and now includes the counts of the following items:
      
      * Comments
      * Groups
      * Users
      * Projects
      * Issues
      * Labels
      * CI builds
      * Snippets
      * Milestones
      * Todos
      * Pushes
      * Merge requests
      * Environments
      * Triggers
      * Deploy keys
      * Pages
      * Project Services
      * Issue Boards
      * CI Runners
      * Deployments
      * Geo Nodes
      * LDAP Groups
      * LDAP Keys
      * LDAP Users
      * LFS objects
      * Protected branches
      * Releases
      * Remote mirrors
      * Web hooks
      
      Closes #997
      
      See merge request !735
      941f7598
    • Patricio Cano's avatar
    • Stan Hu's avatar
      Add more usage data to EE ping. · 5067244c
      Stan Hu authored
      Load it asynchronously to prevent blocking a page load.
      
      Closes #997
      
      Add a container around usage data help-block to prevent horizontal scroll in Firefox
      
      Closes #808
      5067244c
  11. 16 Sep, 2016 1 commit
    • Paco Guzman's avatar
      Fix projects with remote mirrors asynchronously destruction (using pending_delete) · 429ae9ad
      Paco Guzman authored
      When we update the flag pending_delete to true and later try to 
      destroy the remote mirror (through association callbacks) the remote mirror try to load the project, but it is out of the default scope so it just return nil.
      
      As we need the project to remove the reference to the remote mirror but we’re going to delete the project and its repository is not needed to touch the repository to just remove that reference, so we just skip that step in that case
      429ae9ad
  12. 14 Sep, 2016 1 commit
  13. 13 Sep, 2016 2 commits
  14. 12 Sep, 2016 3 commits
    • Alejandro Rodríguez's avatar
      Fix mirrored projects allowing empty import urls · 0774b69f
      Alejandro Rodríguez authored
      Because of missing validations in the projects model, you could
      create a new project with a nil or empty import_url with mirror=true.
      This would cause exceptions when
      RepositoryUpdateMirrorWorker::UpdateMirrorError ran and attempted to
      update one of these projects. This was made easier by the fact that
      you could show the "Mirror repository" checkbox in the UI, check it,
      hide it, and still have its value considered.
      
      The missing validations have been added, and minor adjustments have
      been made to the UI to improve the previous behaviour. A migration
      was also added to update mirror=false in all projects with a nil or
      empty import url that exists because of the described bug.
      0774b69f
    • Drew Blessing's avatar
      Request only the LDAP attributes we need · 32392c1c
      Drew Blessing authored
      32392c1c
    • Valery Sizov's avatar
  15. 09 Sep, 2016 1 commit
  16. 08 Sep, 2016 3 commits
  17. 06 Sep, 2016 1 commit
  18. 05 Sep, 2016 1 commit
  19. 01 Sep, 2016 1 commit
  20. 26 Aug, 2016 4 commits
  21. 25 Aug, 2016 1 commit
  22. 23 Aug, 2016 1 commit
  23. 20 Aug, 2016 1 commit
    • Douwe Maan's avatar
      Merge branch '674-protected-branch-specific-people' into 'master' · f6bb1db8
      Douwe Maan authored
      Restrict pushes / merges to a protected branch to specific people
      
      - Closes #674
      - Related to #179
      
      ![2016-08-04_16-19-12](/uploads/c81032fe262949f3084974c4e622e9eb/2016-08-04_16-19-12.png)
      ![](https://gitlab.com/gitlab-org/gitlab-ee/uploads/342f06078b07b39c2c817b12c81b30fe/Screen_Shot_2016-07-27_at_6.50.56_PM.png)
      ![](https://gitlab.com/gitlab-org/gitlab-ee/uploads/52fe1ae3027d491270ea4845ae7ce54b/Screen_Shot_2016-07-27_at_6.51.02_PM.png)
      
      - [ ]  ee#674 !581 Restrict merges to specific people
          - [x]  Implementation
              - [x]  Model changes
                  - [x]  Protected branch `has_many` access levels
              - [x]  Frontend
                  - [x]  How to add new users / roles?
                  - [x]  Dropdown should include users
                  - [x]  Dropdown shouldn't include users / roles that have already been selected
                  - [x]  Allow removing users / roles
              - [x]  Removing a user from the project should remove their access (?)
          - [x]  Test/refactor
              - [x]  Extract common from {Merge,Push}AccessLevel models
              - [x]  Clean up code that's removing users/roles that are already selected
              - [x]  AccessLevelController?
              - [x]  Fix build
              - [x]  Add more tests
          - [x]  Non `:push_code` users can't push even if added to an access level
          - [x]  Remove access levels when a user is removed from a project
          - [x]  Rebase off EE master instead of the "no one can push" feature branch
              - [x]  Fix create for roles
              - [x]  Fix update for roles
              - [x]  Fix delete
              - [x]  Fix create for users
              - [x]  Fix update for users
              - [x]  Fix defaults
          - [x]  Verify
              - [x]  API
                  - [x]  For a developer user
                      - [x]  When they are granted access specifically to
                          - [x]  Merge
                          - [x]  Push
                  - [x]  For a reporter user
                      - [x]  When they are granted access specifically to
                          - [x]  Merge
                          - [x]  Push
              - [x]  Default branch protection
          - [x]  CHANGELOG
          - [x]  Screenshots
          - [x]  Only show `:push_code` users in the dropdown
          - [x]  Send email when user is added/removed from a protected branch
          - [x]  Assign to {mini,end}boss
          - [x]  Fix build
          - [x]  Implement @dbalexandre's review comments
          - [x]  EE should _add_ to CE
          - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ee/commit/61edf43d31452a0b972dc880e277c825d59f764f/builds) to pass
          - [x]  Test by hand
          - [x]  Assign to endboss
          - [x]  Create CE MR to backport changes
          - [x]  Implement @Douwe's comments
              - [x]  access_level#humanize
              - [x]  Blank line in _protected_branch.html.haml
              - [x]  move stuff into shared partials? (_protected_branch_ee.html.haml)
              - [x]  Can we move stuff into shared partials? (_create_protected_branch_ee.html.haml)
              - [x]  The CE version has a bunch of extra attributes here, do we need those?
              - [x]  We can't indent this section just in EE (protected_branches/show.html.haml)
              - [x]  In EE, try not to add stuff to existing views. (protected_branches/show.html.haml)
              - [x]  If we're gonna change multiline blocks to single-line blocks, we need to so in CE too. (factory)
              - [x]  Split up `ProtectedBranches#show`
          - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ee/commit/3943254d5f92c9be520f685044d23bf75282d42a/builds)
          - [x]  Implement Douwe's suggestions
          - [x]  Add uniqueness validation
          - [x]  Wait for @alfredo's UI enhancements
          - [x]  Remove `show` page access controls
          - [x]  Add more feature specs
          - [ ]  Wait for review for @alfredo's work
          - [ ]  Wait for merge
      
      See merge request !581
      f6bb1db8