1. 28 Jul, 2016 13 commits
    • Stan Hu's avatar
      Merge branch 'log-project-deletion' into 'master' · 15654eca
      Stan Hu authored
      Add a log message when a project is scheduled for destruction for debugging
      
      We have a lot of projects that are in `pending_delete` state. It's not clear whether they were ever scheduled for destruction, or whether Sidekiq just dropped the job due to `MemoryKiller` or some other reason.
      
      Also this will provide a record of which user destroys a project.
      
      #20365 
      
      See merge request !5540
      15654eca
    • Douwe Maan's avatar
      Merge branch 'new-issue-by-email' into 'master' · 4a2320a7
      Douwe Maan authored
      Implement #3243 New Issue by email
      
      So we extend Gitlab::Email::Receiver for this new behaviour,
      however we might want to split it into another class for better
      testing it.
      
      Another issue is that, currently it's using this to parse project
      identifier:
      
          Gitlab::IncomingEmail.key_from_address
      
      Which is using:
      
          Gitlab.config.incoming_email.address
      
      for the receiver name. This is probably `reply` because it's used
      for replying to a specific issue. We might want to introduce another
      config for this, or just use `reply` instead of `incoming`.
      
      I'll prefer to introduce a new config for this, or just change
      `reply` to `incoming` because it would make sense for replying to
      there, too.
      
      The email template used in tests were copied and modified from:
      `emails/valid_reply.eml` which I hope is ok.
      
      /cc @DouweM #3243
      
      See merge request !3363
      4a2320a7
    • Stan Hu's avatar
    • Rémy Coutable's avatar
      Merge branch... · b24ccd4a
      Rémy Coutable authored
      Merge branch '20308-fix-title-that-is-show-in-the-dropdown-toggle-button-on-projects-branches' into 'master'
      
      Fix the title of the toggle dropdown button
      
      ## What does this MR do?
      
      Fix the dropdown-button toggle displaying the correctly title.
      
      ## Are there points in the code the reviewer needs to double check?
      
      See if the title is displaying correctly and if the code is acceptable.
      
      ## Why was this MR needed?
      
      When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title.
      
      ## What are the relevant issue numbers?
      Closes #20308.
      
      ## Screenshots (if relevant)
      ![filter-gitlab-ce](/uploads/52838679d134d57c6ff6120260806fda/filter-gitlab-ce.gif)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - 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 !5515
      b24ccd4a
    • Rémy Coutable's avatar
      Merge branch 'reduce-instrumentation-overhead' into 'master' · 273bea97
      Rémy Coutable authored
      Reduce instrumentation overhead
      
      ## What does this MR do?
      
      This MR reduces the overhead of instrumented methods. See the commit message of 905f8d76 for more information.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Not that I can think of.
      
      ## Why was this MR needed?
      
      The overhead of method call instrumentation was too great.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
      - [x] ~~API support added~~
      - Tests
        - [x] Added for this feature/bug
        - [ ] 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 !5550
      273bea97
    • 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.
      
      E.g.
      
      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'`.
      94e6d51e
    • 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
      (nrclark/dummy_project@81ebdea5df2fb42e59257cb3eaad671a5c53ca36)
      was reduced from around 19 seconds to around 15 seconds using these
      changes.
      905f8d76
    • Rémy Coutable's avatar
      Merge branch 'add_commit_stats' into 'master' · a88a4e85
      Rémy Coutable authored
      Add commit stats
      
      ## What does this MR do?
      When getting commit by SHA in api it returns commit stats
      
      ## Are there points in the code the reviewer needs to double check?
      Not sure about test I added do we need separate test or we can just shove stats assertion in test above
      
      ## Why was this MR needed?
      So api users/clients can get statistics on single commit
      
      ## What are the relevant issue numbers?
      #20307 
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [x] API support 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 !5517
      a88a4e85
    • Valery Sizov's avatar
      Merge branch 'update_guide' into 'master' · 7b015fd8
      Valery Sizov authored
      Added update guide for 8.11
      
      ## What does this MR do?
      
      I need to add notes about Elastic on EE side. To not create ugly conflicts in the future and to not duplicate work I created it here first.
      
      I followed this guide https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#gitlab-ce
      
      See merge request !5545
      7b015fd8
    • Valery Sizov's avatar
      Added update guide for 8.11 · 5881ef49
      Valery Sizov authored
      5881ef49
    • dixpac's avatar
      Add commit stats to commit api response · a4bb9993
      dixpac authored
      a4bb9993
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into new-issue-by-email · 9370bb23
      Lin Jen-Shin authored
      * upstream/master: (45 commits)
        Replace reject_blocked with reject_blocked! in callbacks.
        Fix Project#to_param to keep invalid project suitable for use in URLs
        Update CHANGELOG
        Add feature specs for edit project settings
        Fix renaming repository when name contains invalid chars under settings
        Change requests_profiles resource constraint to catch virtually any file
        Allow skipping users in autocomplete
        Fix typo in CHANGELOG
        Update CHANGELOG
        Respective cache is now expired when creating a new branch
        Update CHANGELOG
        Unify HTML format in static error pages
        Make error pages responsive design
        Move color-logic into HipchatService#HipchatService
        Depened on exact version of SimpleCov when patched
        Refactor spam validation to a concern that can be easily reused and improve legibility in `SpamCheckService`
        Refactor `SpamCheckService` to make it cleaner and clearer.
        Submit all issues on public projects to Akismet if enabled.
        Submit new issues created via the WebUI by non project members to Akismet for spam check.
        Upgrade Bullet from 5.0.0 to 5.2.0.
        ...
      9370bb23
    • Lin Jen-Shin's avatar
      bac99f90
  2. 27 Jul, 2016 27 commits