1. 24 Oct, 2016 4 commits
    • Timothy Andrew's avatar
      Update CHANGELOG · 3b599dd3
      Timothy Andrew authored
      3b599dd3
    • Timothy Andrew's avatar
      Fix branch protection API. · 30b167e9
      Timothy Andrew authored
      1. Previously, we were not removing existing access levels before
         creating new ones. This is not a problem for EE, but _is_ for CE,
         since we restrict the number of access levels in CE to 1.
      
      2. The correct approach is:
      
          CE -> delete all access levels before updating a protected branch
          EE -> delete developer access levels if "developers_can_{merge,push}" is switched off
      
      3. The dispatch is performed by checking if a "length: 1" validation is
         present on the access levels or not.
      
      4. Another source of problems was that we didn't put multiple queries in
         a transaction. If the `destroy_all` passes, but the `update` fails,
         we should have a rollback.
      
      5. Modifying the API to provide users direct access to CRUD access
         levels will make things a lot simpler.
      
      6. Create `create/update` services separately for this API, which
         perform the necessary data translation, before calling the regular
         `create/update` services. The translation code was getting too large
         for the API endpoint itself, so this move makes sense.
      30b167e9
    • Valery Sizov's avatar
      Merge branch 'fix-lint-doc' into 'master' · 59d18a22
      Valery Sizov authored
      Fix lint-doc error
      
      See this build error -> https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/817
      
      I didn't add a CHANGELOG entry because I don't think is needed but just let me know if you think we should add it
      
      See merge request !817
      59d18a22
    • Paco Guzman's avatar
      Fix lint-doc error · 01c1132c
      Paco Guzman authored
      01c1132c
  2. 23 Oct, 2016 1 commit
  3. 21 Oct, 2016 8 commits
    • Yorick Peterse's avatar
      Merge branch 'separate-sidekiq-queues' into 'master' · d2c2d0a4
      Yorick Peterse authored
      Re-organize queues for EE
      
      See merge request !815
      d2c2d0a4
    • Yorick Peterse's avatar
      Re-organize queues for EE workers · be0f459e
      Yorick Peterse authored
      This builds on
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7006 and adjusts
      various parts to take care of EE specific workers.
      be0f459e
    • Yorick Peterse's avatar
      Re-organize queues to use for Sidekiq · 931ff815
      Yorick Peterse authored
      Dumping too many jobs in the same queue (e.g. the "default" queue) is a
      dangerous setup. Jobs that take a long time to process can effectively
      block any other work from being performed given there are enough of
      these jobs.
      
      Furthermore it becomes harder to monitor the jobs as a single queue
      could contain jobs for different workers. In such a setup the only
      reliable way of getting counts per job is to iterate over all jobs in a
      queue, which is a rather time consuming process.
      
      By using separate queues for various workers we have better control over
      throughput, we can add weight to queues, and we can monitor queues
      better. Some workers still use the same queue whenever their work is
      related. For example, the various CI pipeline workers use the same
      "pipeline" queue.
      
      This commit includes a Rails migration that moves Sidekiq jobs from the
      old queues to the new ones. This migration also takes care of doing the
      inverse if ever needed. This does require downtime as otherwise new jobs
      could be scheduled in the old queues after this migration completes.
      
      This commit also includes an RSpec test that blacklists the use of the
      "default" queue and ensures cron workers use the "cronjob" queue.
      
      Fixes gitlab-org/gitlab-ce#23370
      931ff815
    • Rémy Coutable's avatar
      Merge branch 'gitlab-ce-7033-port-to-ce' into 'master' · c41ed4d1
      Rémy Coutable authored
      Port gitlab-org/gitlab-ce!7033 to EE
      
      See merge request !814
      c41ed4d1
    • Rémy Coutable's avatar
      Port gitlab-org/gitlab-ce!7033 to EE · 892d4c53
      Rémy Coutable authored
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      892d4c53
    • Rémy Coutable's avatar
      Merge branch 'fix_search' into 'master' · 964f7110
      Rémy Coutable authored
      Fix a search for non-default branches when ES is enabled
      
      The issue was introduced in 8.12
      
      Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1143
      
      See merge request !811
      964f7110
    • Valery Sizov's avatar
      fc6228b4
    • Rémy Coutable's avatar
      Merge branch... · 78b25cfa
      Rémy Coutable authored
      Merge branch 'ce-22457-reset-filters-button-should-be-invisible-when-no-filters-are-active-ee' into 'master'
      
      `Reset filters` link should only be visible when filters are active
      
      **EE version of gitlab-org/gitlab-ce!6497.**
      
      ## What does this MR do?
      
      > Adds `issuable_filters_present` helper method to check for any filters before rendering the reset link.
      
      ## Why was this MR needed?
      
      > `Reset filters` link is always visible.
      
      See merge request !785
      78b25cfa
  4. 20 Oct, 2016 7 commits
  5. 19 Oct, 2016 12 commits
  6. 18 Oct, 2016 8 commits