1. 21 Jun, 2016 18 commits
  2. 20 Jun, 2016 5 commits
  3. 19 Jun, 2016 1 commit
  4. 18 Jun, 2016 2 commits
  5. 17 Jun, 2016 11 commits
    • Stan Hu's avatar
      Fix Error 500 when attempting to sort merge requests by weight · 6ac89382
      Stan Hu authored
      Fixes #673
      6ac89382
    • Stan Hu's avatar
      Merge branch 'fix-jenkins-service-test-button' into 'master' · 23520789
      Stan Hu authored
      Fix JenkinsService test button
      
      When clicking the "Test" button on the JenkinsCI Service, the following error occurs:
      
      ```
      We tried to send a request to the provided URL but an error occurred: undefined method `message' for [200, ""]:Array 
      ```
      
      !374 changed the implementation to call the `WebHook`, which returns [status, message], instead of the return value of `HTTParty#post`.
      
      Closes #637
      
      See merge request !476
      23520789
    • Douwe Maan's avatar
      Merge branch 'file_locks' into 'master' · cda8de63
      Douwe Maan authored
      File Lock
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/497
      
      - [x] Data layer(tables, models, migrations)
      - [x] Checks on git push
      - [x] Author should be able to push if one owns the lock
      - [x] Path matcher with tokenizer and memoization
      - [x] Show lock status icons by files and folders
      - [x] UI: mockup buttons for locking files, folders
      - [x] UI: Locking files
      - [x] UI: Locking folders
      - [x] Permissions check everywhere
      - [x] Add page to list all locked files/dirs to get overview in case people forget to unlock
      - [x] Refactor `lock_file_button` and `lock_file_link`
      - [x] Testing Git LFS
      - [x] Get rid of code duplication in pre-receive hook
      - [x] Test case: I want to unlock file if I'm a developer and I'm not an author of lock
      - [x] Make it EE option
      - [x] Specs and spinach
      - [x] TODOs in the code
      
      Can be moved to the next iteration:
      - [ ] Duplicate lock checks in the service since pre-receive hook does not work for UI (according to Douwe)
      - [ ] timeago in the lock icon tooltip. It's not working out of the box.
      - [ ] Ajax load bar on click "Lock/Unlock" in the file tree
      - [ ] Nested locking UI. If we look at file and it's locked because of parent we should show it in tooltip. 
      
      
      **Screenshots**
      
      ![joxi_screenshot_1466188707474](/uploads/623e65c9a246b07c9786fd8babdb2dd8/joxi_screenshot_1466188707474.png)![joxi_screenshot_1466188735083](/uploads/4588eff352ee544de5bb5727d501a2cc/joxi_screenshot_1466188735083.png)![joxi_screenshot_1466188758950](/uploads/dee7b342c7825a79ed1629535eced5ed/joxi_screenshot_1466188758950.png)
      
      
      Related info:
      Douwe wrote:
      ```For a next iteration, we need to think about nested locking more. If user A has locked lib/, user B shouldn't be able to lock lib/foo.rb since that falls under lib/. Similarly, if user A has locked lib/foo.rb, user B shouldn't be able to lock lib/, because part of that directory is locked by someone else already.```
      
      See merge request !440
      cda8de63
    • Stan Hu's avatar
      Fix JenkinsService test button · a68bcce7
      Stan Hu authored
      Closes #637
      a68bcce7
    • Valery Sizov's avatar
      File Lock · 22ff4421
      Valery Sizov authored
      22ff4421
    • Robert Speicher's avatar
      Merge branch 'git-hooks-update-notice' into 'master' · 7b612762
      Robert Speicher authored
      Show flash notice when Git Hooks are updated successfully
      
      Fixes #320
      
      See merge request !475
      7b612762
    • Robert Speicher's avatar
      Merge branch 'rebase-gl-id' into 'master' · 601c6a98
      Robert Speicher authored
      Set GL_ID in MergeRequests::RebaseService
      
      We missed this in 6280bcc0 I think.
      
      See merge request !472
      601c6a98
    • Patricio Cano's avatar
    • Valery Sizov's avatar
      Merge branch 'es-confidential-issues-in-private-projects' into 'master' · 8055ca04
      Valery Sizov authored
      ES: Project members with guest role can't access confidential issues
      
      ## What does this MR do?
      
      Restrict access to confidential issues to team members with at least Reporter access when performing search using Elasticsearch.
      
      Allow users to create confidential issues in private projects, and exclude access to them to project members with `Guest` role.
      
      ## Are there points in the code the reviewer needs to double check?
      
      The query generated in the `Elastic::NotesSearch.elastic_search` method.
      
      ## Why was this MR needed?
      
      Confidential issues should only be visible to team members with at least Reporter access.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/14787
      
      ## Screenshots (if relevant)
      
      Not relevant.
      
      See merge request !471
      8055ca04
    • Dmitriy Zaporozhets's avatar
      Merge branch 'first-commit' into 'master' · 942b11ab
      Dmitriy Zaporozhets authored
      MergeRequest#commits.last is actually first_commit
      
      Using a method would be less confusing.
      
      This was discovered in the process of figuring out https://gitlab.com/gitlab-org/gitlab-ee/issues/260
      
      /cc @DouweM 
      
      See merge request !453
      942b11ab
    • Jacob Vosmaer's avatar
      Set GL_ID in MergeRequests::RebaseService · 4ad0f223
      Jacob Vosmaer authored
      4ad0f223
  6. 16 Jun, 2016 3 commits