1. 08 Jun, 2016 29 commits
    • Annabel Dunstone's avatar
      Start adding SVG icons · f3637ed7
      Annabel Dunstone authored
      f3637ed7
    • Jacob Schatz's avatar
      Merge branch 'admin-nav' into 'master' · e6daf1f8
      Jacob Schatz authored
      Sidebar updates
      
      ## What does this MR do?
      Updates `nav/_admin.html.haml` and `nav/_explore.html.haml` to match new compact sidebar design
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-07_at_2.19.18_PM](/uploads/5699987001de901a67d503b097d1b19d/Screen_Shot_2016-06-07_at_2.19.18_PM.png)
      
      See merge request !4517
      e6daf1f8
    • Kamil Trzciński's avatar
      Merge branch 'knapsack-update-results-only-on-master' into 'master' · 19c8fa1b
      Kamil Trzciński authored
      Update Knapsack report only on master
      
      ## What does this MR do?
      
      Makes to generate Knapsack report only on master. This speed-ups tests, because the last stage can be run significant time after previous stages.
      
      
      See merge request !4540
      19c8fa1b
    • Yorick Peterse's avatar
      Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' · abaaad67
      Yorick Peterse authored
      Optimize issuable APIs interaction with notes
      
      See merge request !4471
      abaaad67
    • Rémy Coutable's avatar
      Merge branch 'improve-notification-settings-migrations' into 'master' · ae7fc2e1
      Rémy Coutable authored
      Remove notification settings in batches
      
      ## What does this MR do?
      
      This improves the performance of the migration `db/migrate/20160603180330_remove_duplicated_notification_settings.rb` by removing duplicate rows in batches instead of using a single big `DELETE FROM` query.
      
      ## Why was this MR needed?
      
      The original migration would locally take 45 minutes to complete, possibly up to hours on GitLab.com and similar setups.
      
      ## What are the relevant issue numbers?
      
      #18289
      
      See merge request !4529
      ae7fc2e1
    • Alejandro Rodríguez's avatar
      Update CHANGELOG · 83e12741
      Alejandro Rodríguez authored
      83e12741
    • Jacob Schatz's avatar
      Merge branch 'remove-labels-from-filter' into 'master' · 53498e42
      Jacob Schatz authored
      Removable labels from filtered issuables label bar
      
      When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form
      
      ![Screen_Shot_2016-05-17_at_12.07.47](/uploads/b21e86247aa1bbfd347bef1eb21f1562/Screen_Shot_2016-05-17_at_12.07.47.png)
      
      Closes #15474
      
      See merge request !4178
      53498e42
    • Jacob Schatz's avatar
      Merge branch 'webhooks-shared-form' into 'master' · fadf7915
      Jacob Schatz authored
      Backported from EE shared form for web hooks
      
      ## What does this MR do?
      
      EE uses a shared form for web hooks - so this brings that across to CE.
      
      See merge request !4457
      fadf7915
    • Kamil Trzcinski's avatar
      Update Knapsack report only on master · e7bf9431
      Kamil Trzcinski authored
      e7bf9431
    • Alejandro Rodríguez's avatar
      Fix pseudo n+1 queries with Note and Note Authors in issuables APIs · fade1a4c
      Alejandro Rodríguez authored
      This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
      that the API is returning you never really need to check for the notes. However, if you're
      subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
      once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
      1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
      of notes when counting user notes.
      fade1a4c
    • Alejandro Rodríguez's avatar
      Remove `projects` inclusion in `notes_with_associations` to skip some unnecessary queries · ad83c308
      Alejandro Rodríguez authored
      `notes_with_associations` are used for `participant` declarations, but `Participable`
      only really cares about the target entity project, and not the participants
      projects.
      
      `notes_with_associations` are also used in `Commit::has_been_reverted?` which
      employs the reference extractor of the commit, so no references to the notes
      projects are made there (`Mentionable::all_references` cares only about the
      `author` and other `attr_mentionable`). A paralel situation occurs on
      `Issue::referenced_merge_requests`.
      ad83c308
    • Yorick Peterse's avatar
      Remove notification settings in batches · 3883bc05
      Yorick Peterse authored
      This improves performance of the duplicate notification settings
      migration by removing duplicates in batches instead of using one big
      "DELETE FROM" query.
      
      The previous query would locally run over 45 minutes without even
      finishing. This new setup finished in a matter of seconds.
      
      Fixes #18289
      3883bc05
    • Rémy Coutable's avatar
      Merge branch 'support-fog-azure' into 'master' · 722211cd
      Rémy Coutable authored
      Add fog-azure to supported backup list
      
      !4396 left out Azure by accident.
      
      
      See merge request !4444
      722211cd
    • Rémy Coutable's avatar
      Merge branch 'git-http-controller' into 'master' · 07b32287
      Rémy Coutable authored
      Dismantling Grack::Auth part 1: Git HTTP clients
      
      Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/14501
      
      This does not completely get rid of Grack::Auth yet because Git LFS
      support is 'behind' it and I would like to not make this MR bigger
      than needed.
      
      - changed tests to make HTTP requests instead of calling Rack apps
      - added missing test cases for Git HTTP authentication
      - moved Git HTTP requests into a 'normal' Rails controller
      
      See merge request !3361
      07b32287
    • Rémy Coutable's avatar
      Merge branch 'fix-endless-redirect' into 'master' · 99ea3271
      Rémy Coutable authored
      Fix endless redirections when accessing user OAuth applications when they are disabled
      
      ## What does this MR do?
      
      This MR fixes a bug where the browser would be redirect endlessly when attempting to access the user's OAuth applications when an admin has disabled this system-wide setting.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I assume disabling the nav button is better than showing a page that says, "OAuth applications are disabled by the admin."
      
      ## Why was this MR needed?
      
      Lots of users were confused when they hit endless redirect errors.
      
      ## What are the relevant issue numbers?
      
      #14770 
      
      See merge request !4525
      99ea3271
    • Stan Hu's avatar
      Merge branch 'fix-markdown-spec' into 'master' · 8d6c4b30
      Stan Hu authored
      Fix markdown_spec to not use `before(:all)` in order to properly cleanup database after testing
      
      
      
      See merge request !4515
      8d6c4b30
    • Stan Hu's avatar
      Fix endless redirections when accessing user OAuth applications when they are disabled · 3b50d96b
      Stan Hu authored
      Also hides the "Applications" nav button if OAuth applications are disabled by the admin.
      
      Closes #14770
      3b50d96b
    • Douwe Maan's avatar
      Merge branch 'test-for-ci_authorized_runners' into 'master' · 53bf9da4
      Douwe Maan authored
      Add a test for User#ci_authorized_runners
      
      ## What does this MR do?
      
      Add a test for User#ci_authorized_runners
      
      ## Are there points in the code the reviewer needs to double check?
      
      Should we add `Project#add_user` so that it's similar to `Group#add_user`?
      
      ## Why was this MR needed?
      
      I am going to make some changes to this method for !4093, but I couldn't find a corresponding test so I want to add it in case I would break anything.
      
      ## What are the relevant issue numbers?
      
      This is a test for current behaviour, before implementing #3407
      
      See merge request !4404
      53bf9da4
    • Douwe Maan's avatar
      Merge branch 'gh-disable-webhooks' into 'master' · a0320bed
      Douwe Maan authored
      Check if GitHub rate limite API was reached before update Webhooks
      
      ## What does this MR do?
      
      Checks if the job needs to sleep, and wait for the rate limit to be reseted before update each Webhook.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      The import process can fail if the API rate limit was reached during the import process.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/17498
      
      ## Screenshots (if relevant)
      
      Not relevant.
      
      See merge request !4509
      a0320bed
    • Kamil Trzciński's avatar
      Merge branch 'knapsack-env-ci' into 'master' · c0f31845
      Kamil Trzciński authored
      Enable Knapsack only in CI environment
      
      Fixes running tests locally. Enables Knapsack only in CI environment.
      
      cc @grzesiek 
      
      See merge request !4528
      c0f31845
    • Phil Hughes's avatar
      Fixed issue with dropdown toggle not updating · d3ff691d
      Phil Hughes authored
      Added tests
      d3ff691d
    • Phil Hughes's avatar
      f4eb5572
    • Phil Hughes's avatar
      Updated design · cba0321f
      Phil Hughes authored
      cba0321f
    • Phil Hughes's avatar
      Removable labels from filtered issuables label bar · 519c758f
      Phil Hughes authored
      When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form
      
      Closes #15474
      519c758f
    • Kamil Trzcinski's avatar
      Enable Knapsack only in CI environment · eb950191
      Kamil Trzcinski authored
      eb950191
    • Jacob Vosmaer's avatar
      Add parentheses · df62cbd9
      Jacob Vosmaer authored
      df62cbd9
    • Jacob Vosmaer's avatar
      Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller · bebe110d
      Jacob Vosmaer authored
      Conflicts:
      	lib/gitlab/workhorse.rb
      bebe110d
    • Jacob Schatz's avatar
      Merge branch '18080-project-header-alignment' into 'master' · 915ad255
      Jacob Schatz authored
      Add flexbox to project header
      
      ## What does this MR do?
      Adds flexbox to project header to keep components vertically centered regardless of description presence/length
      
      ## What are the relevant issue numbers?
      Closes  #18080 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png)     
      ![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png)
      
      See merge request !4417
      915ad255
    • Jacob Schatz's avatar
      Merge branch '18074-cancel-pipeline-text' into 'master' · 402767e0
      Jacob Schatz authored
      Change color of canceled ci text to gray
      
      ## What does this MR do?
      Change text color of Canceled builds from `$gl-danger` to `$gl-gray`
      
      ## What are the relevant issue numbers?
      Closes #18074 
      
      ## Screenshots (if relevant)
      <img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px">
      
      See merge request !4412
      402767e0
  2. 07 Jun, 2016 11 commits