1. 11 Jul, 2016 9 commits
  2. 10 Jul, 2016 10 commits
  3. 09 Jul, 2016 10 commits
  4. 08 Jul, 2016 11 commits
    • Dmitriy Zaporozhets's avatar
      3bae69aa
    • Yorick Peterse's avatar
      Re-use queries in reference parsers · 9ac4c556
      Yorick Peterse authored
      This caches various queries to ensure that multiple reference extraction
      runs re-use any objects queried in previous runs.
      9ac4c556
    • Fatih Acet's avatar
      Merge branch 'new-snippet-button-permissions' into 'master' · 697e9889
      Fatih Acet authored
      Update New Snippet buttons.
      
      ## What does this MR do?
      
      No longer shows New Snippet button to users who aren't able to create a new snippet in the given context.
      
      Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Make sure the snippets pages don't break or show the buttons to users who shouldn't have access to them.
      
      ## Why was this MR needed?
      
      Users that weren't logged in would click the New Snippet button and get a 404 error. You would also get 404 errors from the New Snippet button on project snippets for projects you weren't able to create snippets for.
      
      ## What are the relevant issue numbers?
      
      Fixes #14595.
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![before1](/uploads/2c222cd981332d30772054cefadafa28/before1.png)
      
      ![before2](/uploads/2734f8a84ae293b08dd982f2ed7da028/before2.png)
      
      After:
      
      ![after1](/uploads/c84aa9aec17056095271b0f24c6e9b5b/after1.png)
      
      ![after2](/uploads/70fe37ad7be5054bf20439ca0a1f5ccc/after2.png)
      
      ![after3](/uploads/afcd435c211482e9df25cb8971f1e65e/after3.png)
      
      ![after4](/uploads/9eab87440aae4991b508373ff36e3c7a/after4.png)
      
      ![after5](/uploads/f5ec167cb3e1115d3b3a43bd5231bc60/after5.png)
      
      ![after6](/uploads/c774cbb1f9babe3382ff69af7060b9c5/after6.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 !4998
      697e9889
    • Connor Shea's avatar
      Use btn-danger for delete button. · 226bc587
      Connor Shea authored
      226bc587
    • Connor Shea's avatar
      Update New Snippet buttons. · 443fdff1
      Connor Shea authored
      No longer shows New Snippet button to users who aren't able to create a new snippet in the given context.
      
      Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons.
      
      Fixes #14595.
      443fdff1
    • Fatih Acet's avatar
      Merge branch 'cs-cropper' into 'master' · 57da2e87
      Fatih Acet authored
      Split Cropper.js from the main JavaScript manifest.
      
      ## What does this MR do?
      
      Splits Cropper.js from the main JavaScript file.
      
      ## Are there points in the code the reviewer needs to double check?
      
      That the avatar uploader works. (It did in my testing)
      
      ## Why was this MR needed?
      
      Smaller JS payload.
      
      ## What are the relevant issue numbers?
      
      #14372 
      
      ## Does this MR meet the acceptance criteria?
      
      - 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 !4978
      57da2e87
    • Connor Shea's avatar
      Run bundle install. · 776632b4
      Connor Shea authored
      776632b4
    • Sean McGivern's avatar
      Tidy up spec action names · e462e122
      Sean McGivern authored
      e462e122
    • Rémy Coutable's avatar
      Merge branch 'improve-project-limit-field' into 'master' · 79304c6a
      Rémy Coutable authored
      Add min attribute to projects_limit field on user's form
      
      This PR adds `min=0` attribute to `:projects_limit` field on user's form in the admin panel. It improves UX disallowing user to enter negative values in this field.
      
      ![](http://take.ms/70V8W)
      
      See merge request !3622
      79304c6a
    • Rémy Coutable's avatar
      Merge branch 'fix_gemfile' into 'master' · df97d551
      Rémy Coutable authored
      Fix gemfile
      
      1. replace `"` to `'` in Gemfile.
      
      2. change `require: nil` to `require: false`.
      `require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places.
      
      3. set version for gems.
      better gem's version control for prevent dependency errors.
      
      See merge request !5078
      df97d551
    • Robert Speicher's avatar
      Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' · 989a9607
      Robert Speicher authored
      Enable Style/IdenticalConditionalBranches Rubocop cop
      
      ## What does this MR do?
      
      This MR enables Rubocop cop that checks for identical lines at the end of each branch of a conditional statement.
      
      Examples:
      
      ```ruby
      @bad
      if condition
        do_x
        do_z
      else
        do_y
        do_z
      end
      
      @good
      if condition
        do_x
      else
        do_y
      end
      do_z
      ```
      
      ## What are the relevant issue numbers?
      
      #17478
      
      See merge request !5011
      989a9607