1. 03 Aug, 2016 1 commit
  2. 02 Aug, 2016 8 commits
  3. 01 Aug, 2016 14 commits
  4. 31 Jul, 2016 2 commits
  5. 30 Jul, 2016 2 commits
  6. 29 Jul, 2016 8 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
    • Paco Guzman's avatar
    • Z.J. van de Weg's avatar
      Add an URL field to Environments · be9aa7f1
      Z.J. van de Weg authored
      This MR adds a string (thus max 255 chars) field to the enviroments
      table to expose it later in other features.
    • Paco Guzman's avatar
    • Yorick Peterse's avatar
      Method for returning issues readable by a user · 002ad215
      Yorick Peterse authored
      The method Ability.issues_readable_by_user takes a list of users and an
      optional user and returns an Array of issues readable by said user. This
      method in turn is used by
      Banzai::ReferenceParser::IssueParser#nodes_visible_to_user so this
      method no longer needs to get all the available abilities just to check
      if a user has the "read_issue" ability.
      To test this I benchmarked an issue with 222 comments on my development
      environment. Using these changes the time spent in nodes_visible_to_user
      was reduced from around 120 ms to around 40 ms.
    • Timothy Andrew's avatar
      Implement final review comments from @rymai. · cebcc417
      Timothy Andrew authored
      1. Instantiate `ProtectedBranchesAccessSelect` from `dispatcher`
      2. Use `can?(user, ...)` instead of `user.can?(...)`
      3. Add `DOWNTIME` notes to all migrations added in !5081.
      4. Add an explicit `down` method for migrations removing the
         `developers_can_push` and `developers_can_merge` columns, ensuring that
         the columns created (on rollback) have the appropriate defaults.
      5. Remove duplicate CHANGELOG entries.
      6. Blank lines after guard clauses.
    • Timothy Andrew's avatar
      Implement review comments from @dbalexandre. · 7b2ad2d5
      Timothy Andrew authored
      1. Remove `master_or_greater?` and `developer_or_greater?` in favor of
         `max_member_access`, which is a lot nicer.
      2. Remove a number of instances of `include Gitlab::Database::MigrationHelpers`
         in migrations that don't need this module. Also remove comments where
         not necessary.
      3. Remove duplicate entry in CHANGELOG.
      4. Move `ProtectedBranchAccessSelect` from Coffeescript to ES6.
      5. Split the `set_access_levels!` method in two - one each for `merge` and
         `push` access levels.
    • Timothy Andrew's avatar
      Add changelog entry. · 8e25ddc5
      Timothy Andrew authored
  7. 28 Jul, 2016 5 commits
    • Annabel Dunstone's avatar
    • Alejandro Rodríguez's avatar
    • James Lopez's avatar
      fix repo hooks missing on import · 32d8aa6d
      James Lopez authored
       fix spec and added changelog
    • Herminio Torres's avatar
      Fix the title of the toggle dropdown button · 94e6d51e
      Herminio Torres authored
      Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value.
      When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title.
      Change the implementation of the `link_to` `filter_branches_path`
      - Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`.
      - Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
    • Yorick Peterse's avatar
      Reduce instrumentation overhead · 905f8d76
      Yorick Peterse authored
      This reduces the overhead of the method instrumentation code primarily
      by reducing the number of method calls. There are also some other small
      optimisations such as not casting timing values to Floats (there's no
      particular need for this), using Symbols for method call metric names,
      and reducing the number of Hash lookups for instrumented methods.
      The exact impact depends on the code being executed. For example, for a
      method that's only called once the difference won't be very noticeable.
      However, for methods that are called many times the difference can be
      more significant.
      For example, the loading time of a large commit
      was reduced from around 19 seconds to around 15 seconds using these