GitLab wird am Donnerstag, den 09. Dezember, zwischen 08:00 und 10:00 Uhr wegen wichtigen Wartungsarbeiten nicht zur Verfügung stehen.

  1. 04 Aug, 2016 1 commit
  2. 01 Aug, 2016 1 commit
  3. 29 Jul, 2016 4 commits
    • Stan Hu's avatar
      Properly abort a merge when merge conflicts occur · 60529e02
      Stan Hu authored
      If somehow a user attempted to accept a merge request that had
      conflicts (e.g. the "Accept Merge Request" button or the MR itself was
      not updated), `MergeService` did not properly detect that a conflict
      occurred. It would assume that the MR went through without any issues
      and close the MR as though everything was fine. This could cause
      data loss if the source branch were removed.
      
      Closes #20425
      60529e02
    • Timothy Andrew's avatar
      Use `Gitlab::Access` to protected branch access levels. · 0a8aeb46
      Timothy Andrew authored
      1. It makes sense to reuse these constants since we had them duplicated
         in the previous enum implementation. This also simplifies our
         `check_access` implementation, because we can use
         `project.team.max_member_access` directly.
      
      2. Use `accepts_nested_attributes_for` to create push/merge access
         levels. This was a bit fiddly to set up, but this simplifies our code
         by quite a large amount. We can even get rid of
         `ProtectedBranches::BaseService`.
      
      3. Move API handling back into the API (previously in
         `ProtectedBranches::BaseService#translate_api_params`.
      
      4. The protected branch services now return a `ProtectedBranch` rather
         than `true/false`.
      
      5. Run `load_protected_branches` on-demand in the `create` action, to
         prevent it being called unneccessarily.
      
      6. "Masters" is pre-selected as the default option for "Allowed to Push"
         and "Allowed to Merge".
      
      7. These changes were based on a review from @rymai in !5081.
      0a8aeb46
    • Timothy Andrew's avatar
      Fix `git_push_service_spec` · c93a895a
      Timothy Andrew authored
      1. Caused by incorrect test setup. The user wasn't added to the project,
         so protected branch creation failed authorization.
      
      2. Change setup for a different test (`Event.last` to
         `Event.find_by_action`) because our `project.team << ...` addition
         was causing a conflict.
      c93a895a
    • Timothy Andrew's avatar
      Fix default branch protection. · a9958ddc
      Timothy Andrew authored
      1. So it works with the new data model for protected branch access levels.
      a9958ddc
  4. 27 Jul, 2016 2 commits
  5. 21 Jul, 2016 6 commits
  6. 19 Jul, 2016 1 commit
  7. 18 Jul, 2016 3 commits
  8. 16 Jul, 2016 1 commit
  9. 15 Jul, 2016 5 commits
  10. 14 Jul, 2016 1 commit
  11. 13 Jul, 2016 4 commits
  12. 12 Jul, 2016 3 commits
  13. 11 Jul, 2016 1 commit
  14. 07 Jul, 2016 3 commits
  15. 04 Jul, 2016 2 commits
  16. 01 Jul, 2016 1 commit
  17. 30 Jun, 2016 1 commit
    • Paco Guzman's avatar
      Expire branch/tag git data when needed. · 5fe85bc8
      Paco Guzman authored
      When pushing commits to existing branches we don’t
      need to flush branch git data (branch names / counts)
      
      When flushes the cache when pushing commits skip to
      flush branch and tag git data (names / counts) because
      those operations are managed explicitly in each case
      
      Repopulated expired cache as soon as possible
      5fe85bc8