BigW Consortium Gitlab

  1. 14 Mar, 2017 1 commit
  2. 06 Mar, 2017 1 commit
    • Fix issues mentioned but not closed for JIRA · 9f612cc4
      Sean McGivern authored
      The `ReferenceExtractor` would return an array of `ExternalIssue`
      objects, and then perform `Array#-` to remove the issues
      closed. `ExternalIssue`s had `==` defined, but not `hash` or `eql?`,
      which are used by `Array#-`.
  3. 01 Mar, 2017 1 commit
    • Update occurrences of MWBS to MWPS · a0101ebf
      James Lopez authored
       Rename column in the database
       Rename fields related to import/export feature
       Rename API endpoints
       Rename documentation links
       Rename the rest of occurrences in the code
       Replace the images that contain the words "build succeeds" and docs referencing to them
       Make sure pipeline is green and nothing is missing.
      
      updated doc images
      
      renamed only_allow_merge_if_build_succeeds in projects and fixed references
      
      more updates
      
      fix some spec failures
      
      fix rubocop offences
      
      fix v3 api spec
      
      fix MR  specs
      
      fixed issues with partials
      
      fix MR spec
      
      fix alignment
      
      add missing v3 to v4 doc
      
      wip - refactor v3 endpoints
      
      fix specs
      
      fix a few typos
      
      fix project specs
      
      copy entities fully to V3
      
      fix  entity error
      
      more fixes
      
      fix failing specs
      
      fixed missing entities in V3 API
      
      remove comment
      
      updated code based on feedback
      
      typo
      
      fix spec
  4. 24 Feb, 2017 1 commit
    • Only create unmergeable todos once · 2da8bc3d
      Sean McGivern authored
      Previously, we created an unmergeable todo when a merge request:
      
      1. Had merge when pipeline succeeds set.
      2. Became unmergeable.
      
      However, when merge when pipeline succeeds fails due to unmergeability,
      the flag isn't actually removed. And a merge request can become
      unmergeable multiple times, as every time the target branch is updated
      we need to re-check the mergeable status. This means that if the todo
      was marked done, and the MR was checked again, a new todo would be
      created for the same event.
      
      Instead of checking this, we should create the todo from the service
      responsible for merging when the pipeline succeeds. That way the todo is
      guaranteed to only be created when we care about it.
  5. 23 Feb, 2017 5 commits
    • Revert "Enable Style/DotPosition" · 56de781a
      Douwe Maan authored
      This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
      
      # Conflicts:
      #	.rubocop.yml
      #	.rubocop_todo.yml
      #	lib/gitlab/ci/config/entry/global.rb
      #	lib/gitlab/ci/config/entry/jobs.rb
      #	spec/lib/gitlab/ci/config/entry/factory_spec.rb
      #	spec/lib/gitlab/ci/config/entry/global_spec.rb
      #	spec/lib/gitlab/ci/config/entry/job_spec.rb
      #	spec/lib/gitlab/ci/status/build/factory_spec.rb
      #	spec/lib/gitlab/incoming_email_spec.rb
    • Revert "Prefer leading style for Style/DotPosition" · 1fe7501b
      Douwe Maan authored
      This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
    • Prefer leading style for Style/DotPosition · 206953a4
      Douwe Maan authored
    • Enable Style/DotPosition · 3dadf306
      Douwe Maan authored
    • Fix MR changes tab size count · 5a2c6881
      Sean McGivern authored
      This was wrong when there were over 100 files in the diff, because we
      did not use the same diff options as subclasses of
      `Gitlab::Diff::FileCollection::Base` when getting the raw diffs. (The
      reason we don't use those classes directly is because they may perform
      highlighting, which isn't needed for just counting the diffs.)
  6. 07 Feb, 2017 1 commit
  7. 06 Feb, 2017 2 commits
  8. 31 Jan, 2017 1 commit
  9. 19 Jan, 2017 1 commit
  10. 14 Jan, 2017 1 commit
  11. 13 Jan, 2017 1 commit
  12. 11 Jan, 2017 1 commit
  13. 03 Jan, 2017 1 commit
  14. 28 Dec, 2016 1 commit
  15. 16 Dec, 2016 7 commits
  16. 15 Dec, 2016 1 commit
    • Merge branch 'jej-note-search-uses-finder' into 'security' · 12db4cc0
      Douwe Maan authored
      Fix missing Note access checks in by moving Note#search to updated NoteFinder
      
      Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
      
      ## Which fixes are in this MR?
      
      :warning: - Potentially untested  
      :bomb: - No test coverage  
      :traffic_light: - Test coverage of some sort exists (a test failed when error raised)  
      :vertical_traffic_light: - Test coverage of return value (a test failed when nil used)  
      :white_check_mark: - Permissions check tested
      
      ### Note lookup without access check
      
      - [x] :white_check_mark: app/finders/notes_finder.rb:13 :download_code check
      - [x] :white_check_mark: app/finders/notes_finder.rb:19 `SnippetsFinder`
      - [x] :white_check_mark: app/models/note.rb:121 [`Issue#visible_to_user`]
      - [x] :white_check_mark: lib/gitlab/project_search_results.rb:113
        - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`.
        - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked.
      
      ### Previous discussions
      - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit
      - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used
        - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223
      
      ###  Acceptance criteria met?
      - [x] Tests added for new code
      - [x] TODO comments removed
      - [x] Squashed and removed skipped tests
      - [x] Changelog entry
      - [ ] State Gitlab versions affected and issue severity in description
      - [ ] Create technical debt issue for NotesFinder.
        - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two.
        - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)`
        - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes`
      
      See merge request !2035
  17. 05 Dec, 2016 1 commit
    • Feature: delegate all open discussions to Issue · 1123057a
      Bob Van Landuyt authored
      When a merge request can only be merged when all discussions are
      resolved. This feature allows to easily delegate those discussions to a
      new issue, while marking them as resolved in the merge request.
      
      The user is presented with a new issue, prepared with mentions of all
      unresolved discussions, including the first unresolved note of the
      discussion, time and link to the note.
      
      When the issue is created, the discussions in the merge request will get
      a system note directing the user to the newly created issue.
  18. 02 Dec, 2016 1 commit
  19. 01 Dec, 2016 1 commit
  20. 29 Nov, 2016 1 commit
  21. 23 Nov, 2016 1 commit
  22. 21 Nov, 2016 2 commits
  23. 04 Nov, 2016 2 commits
  24. 24 Oct, 2016 2 commits
  25. 20 Oct, 2016 2 commits