Commit Graph
756 Commits
Author SHA1 Message Date
James Lopez a7acfa6614 add project members to export 2016-03-10 16:29:38 +01:00
James Lopez 4b88b4ffd5 fix wiki path issues and spec 2016-03-09 10:35:38 +01:00
James Lopez f9c6168cc4 fix new line issue 2016-03-08 18:20:32 +01:00
James Lopez 99d87d8698 WIP - added wiki repo bundler 2016-03-08 18:17:57 +01:00
James Lopez 556cafa44e added repo bundler spec and refactored some of the export code 2016-03-08 15:53:32 +01:00
James Lopez 4e73f9827c WIP - started working on bundle the repo, refactored some stuff and updated spec 2016-03-08 12:35:37 +01:00
James Lopez f9eb3fc0aa WIP - initial export service and spec 2016-03-07 18:26:15 +01:00
Douwe Maan 99f08b3f72 Merge branch 'feature/cross-project-labels' into 'master'
Add support for cross project references for labels

## Summary

Support for cross project references for labels.

## Rationale

1.   Cross project label references are currently not supported in GitLab
1.   `to_reference` method signature in `Label` model breaks the abstraction introduced in `Referable`.

      `concerns/referable.rb:  def to_reference(_from_project = nil)`

      Signatures:

      ```
      label.rb:           def to_reference(format = :id)

      commit_range.rb:    def to_reference(from_project = nil)
      commit.rb:          def to_reference(from_project = nil)
      external_issue.rb:  def to_reference(_from_project = nil)
      group.rb:           def to_reference(_from_project = nil)
      issue.rb:           def to_reference(from_project = nil)
      merge_request.rb:   def to_reference(from_project = nil)
      milestone.rb:       def to_reference(from_project = nil)
      project.rb:         def to_reference(_from_project = nil)
      snippet.rb:         def to_reference(from_project = nil)
      user.rb:            def to_reference(_from_project = nil)
      ```

     This MR suggests using `def to_reference(from_project = nil, format: :id)` which makes use of keyword arguments and preserves abstract interface.

1.   We need support for cross project label references when we want to move issue to another project

     It may happen that issue description, system notes or comments contain reference to label and this reference will be invalid after moving issue to another project and will not be displayed correctly unless we have support for cross project references.

     Merge request that needs this feature: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831


I think that cross project label references may be useful, (example: `Hey, see our issues for CI in GitLab CE! - gitab-org/gitlab-ce~"CI"`).

cc @JobV @DouweM @rspeicher 

See merge request !2966
2016-03-07 09:16:22 +00:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Grzegorz Bizon 65ba4da925 Add support for keyword arguments in label reference method 2016-03-03 10:41:11 +01:00
Rubén Dávila 0c116d8ed6 Check for conflicts before creating target branch. 2016-03-01 19:16:27 -05:00
Robert Speicher 2c6e34bc16 Merge branch 'repository-caching-refactor' into 'master'
Refactor Repository Caching

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515

See merge request !2936
2016-02-26 22:07:50 +00:00
Douglas Barbosa Alexandre c1482943c4 Does not create a todo when commenting on commit or project snippet 2016-02-24 21:09:40 -03:00
Yorick Peterse ff28a7cc36 Moved cache expiration code to Repository hooks
This keeps all the cache expiration code in a single file/class instead
of spreading it all across the codebase.
2016-02-23 12:02:59 +01:00
Kamil Trzcinski 7c288c07f1 Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01:00
Douglas Barbosa Alexandre 04d1b41258 Merge branch 'tasks' into 'master'
Add Todos

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
2016-02-22 02:36:41 +00:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre 408e010d65 Rename IssuableBaseService#have_changes? to has_changes? 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre ce78813c2a Create or mark task pending as soon the action happens 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre fc3f8a8ff7 Ensure that we only have one task per issue/mr 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 4465613647 Explicit mention of the assignee make a task
Since potentially the previous assign-task has already been handled.
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 424cb9ccae 💄 Cosmetic changes 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 3b98adcc75 Create a pending task when a user is mentioned when edit a issue/mr/note 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 4120b7941d Does not create a task if new assignee is the current user 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 1d476b0656 Create a pending task when a user is mentioned on a note 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 14fc05ebfd Create a pending task when a user is mentioned on issue/mr 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 4bfc377ff6 Rename TaskService#mark_as_done to mark_pending_tasks_as_done 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 56a5fc0cd3 Move common behavior to to IssuableBaseService 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 372cdf4ce5 Marks pending tasks for an user as done when he merge the MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre c86b12bf69 Marks pending tasks for an user as done when he close the MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7bed6ee21d Marks pending tasks for an user as done when he edit a MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 802bf6d012 Create a pending task when an MR is assigned to someone 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 9da03c45c9 Mark pending tasks for the current user as done when he edit a note 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 49cd19652a Mark pending tasks for the note author as done when he left a note 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre a56ada0a1e Marks pending tasks for an user as done when he close the issue 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre e81061a211 Marks pending tasks for an user as done when he edit an issue 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre c8f2d18abd Does not create a task for new issue when assignee is the current user 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 422a01fc85 Create a pending task when an issue is assigned to someone 2016-02-20 12:10:26 -02:00
Kamil Trzcinski 6febe1007e Discover branches for commit statuses ref-less when doing merge when succeeded 2016-02-19 23:24:31 +01:00
Rubén DávilaandRobert Speicher 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 6908663479 Refactor RevertService. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 2ea5b37f2e Some fixes and refactors for code related to forks. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 11345866d8 Don't make Repository#revert aware of MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher e22cdb40ec Big refactor for #revert_commit.
* Now checking if a commit is already reverted or there is a conflict is
  much more faster.
* No longer need to create a new branch.
2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 6b0e478353 Some fixes required for conflicts on revert. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 91e6e32d13 Make it work for merge commits. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 5bb5019e04 Use adequate description for new MR. 2016-02-19 13:14:49 -05:00