Commit Graph
24812 Commits
Author SHA1 Message Date
James Lopez c2304141d6 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-03-11 09:47:35 +01:00
James Lopez 2fd3023186 fix project members export 2016-03-11 09:46:00 +01:00
James Lopez 3f479edd16 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-03-10 18:44:58 +01:00
James Lopez febff153cc started mapping members 2016-03-10 18:43:57 +01:00
James Lopez cc8aafeded typo 2016-03-10 18:41:57 +01:00
James Lopez af9b48230b Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-03-10 16:32:37 +01:00
James Lopez a7acfa6614 add project members to export 2016-03-10 16:29:38 +01:00
James Lopez 2a7a1bcc3a refactored methods in project tree restorer 2016-03-10 16:21:17 +01:00
James Lopez e90b1e147e refactored project creation to create the associations as well 2016-03-10 15:35:44 +01:00
James Lopez 40de1b4634 revert back services changes
(cherry picked from commit 2cc6aae)
2016-03-10 13:31:14 +01:00
James Lopez f0ce83b190 modify model creation to use services when they are available 2016-03-10 13:04:11 +01:00
James Lopez 2cc6aaec49 WIP (broken) - playing with import stuff 2016-03-09 18:42:04 +01:00
James Lopez 2dc2ce45d7 WIP - broken spec and some import stuff so I can create a MR on this. 2016-03-09 16:21:02 +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 68eae04538 finish project tree saver spec 2016-03-08 10:21:02 +01:00
James Lopez e228453f47 updated spec 2016-03-07 19:14:06 +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
Douwe Maan eab7892dc1 Merge branch 'rs-factory-nitpicks' into 'master'
More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108
2016-03-07 09:02:49 +00:00
Douwe Maan d43c778402 Merge branch 'indicate-mr-diverged-from-target' into 'master'
Indicate when an MR diverged from the target branch

This adds an indicator to the "Merge MR" box, to tell if and how much an MR diverged from its target branch.

For instance, consider an MR to merge the branch `feature` into `master`. Some other commits were added to `master` since `feature` was created, and the two branches diverged.

```text
o master
|
o    o feature
|    |
o    o
|  /
o
```

In this case, there will be a label in the MR Merge box stating:

> This MR is by 3 commits behind the target branch `master`.

## Screenshots

### The branch diverged from the target (UI Proposal)

![UI_suggestion_1](/uploads/cd5bee3959e68026ec7d5097259d53f4/UI_suggestion_1.png)

### The branch diverged from the target (alternative UI Proposal)

![UI_suggestion_2](/uploads/f36977101b59a610850e129837dfbc83/UI_suggestion_2.png)

## How is this useful?

- In a _rebase-workflow_ (MR are preferably rebased before being merged), the reviewer wants to know if an MR is rebased on the target branch before merging it. 
    
    _With this indicator, the reviewer knows immediately if the branch is rebased, or if she needs to ask the committer to rebase its branch._

<br>

- To keep the git history readable, a team prefers to avoid merging branches that really lag a lot behind the target branch. Merging an MR that is 10 commits behind is fine, but 200 is too much.

    _With this indicator, the reviewer can see on the MR page if the branch is really far behind the target – or only a few commits behind._

## Open questions

We've been using this at @captaintrain for a few months now, and found it quite useful.

I guess the open-questions are mostly: what UI would be the more adequate? Any thoughts on this, on the general usefulness and/or on the code?

See merge request !2217
2016-03-07 09:01:26 +00:00
Douwe Maan be1ae2d660 Merge branch 'rs-note-delegates-mentionable'
# Conflicts:
#	app/models/note.rb
2016-03-07 09:38:16 +01:00
Douwe Maan 49d7a29347 Merge branch 'rs-remove-diffline' into 'master'
Remove unused DiffLine model

Added in Mar 2014. Only usage removed in Sep 2014.

See merge request !3105
2016-03-07 08:34:12 +00:00
Douwe Maan de872f2668 Merge branch 'rs-note-reuse-for-methods' into 'master'
Make better use of the `Note#for_*?` methods

We've got all these polymorphic type-checking methods, might as well use
'em everywhere it makes sense.

See merge request !3106
2016-03-07 08:32:49 +00:00
Douwe Maan 20ed08ed8f Merge branch 'rs-note-model-cleanup' into 'master'
Minor Note model cleanup

Remove `Note#noteable_type_name`

This method was added in Dec 2012, its single use was removed two days
later, and it's been there ever since.

---

Remove `Note#system?` "override"

This method was duplicating default Rails behavior.

See merge request !3104
2016-03-07 08:32:10 +00:00
Robert Speicher 7612fdbaa8 Remove unnecessary attribute definitions from Service factory 2016-03-06 16:55:17 -05:00
Robert Speicher de944c914b Add traits for each access_level to ProjectMember factory 2016-03-06 16:53:22 -05:00
Robert Speicher 042b047fc8 Remove unused another_email factory 2016-03-06 16:34:43 -05:00
Achilleas Pipinellis b8a1f1c42d Merge branch 'ci_quickstart' into 'master'
Add a TL;DR version in quickstart guide



See merge request !3026
2016-03-06 08:42:28 +00:00
Robert Speicher 84dab62c18 Delegate a Note's Mentionable methods to its noteable object 2016-03-05 20:45:05 -05:00
Robert Speicher dcbf7d13c4 Make better use of the Note#for_*? methods
We've got all these polymorphic type-checking methods, might as well use
'em everywhere it makes sense.
2016-03-05 20:19:01 -05:00
Robert Speicher 1c6fa9ff9e Remove unused DiffLine model
Added in Mar 2014. Only usage removed in Sep 2014.
2016-03-05 20:10:16 -05:00
Robert Speicher 9bbf873e46 Merge branch 'master' into 'master'
Reduce progress bar noise during brakeman run

See merge request !3101
2016-03-05 22:43:02 +00:00
Robert Speicher 1b27c3c5f8 Remove Note#system? "override"
This method was duplicating default Rails behavior.
2016-03-05 17:32:37 -05:00
Robert Speicher eb3ca32813 Remove Note#noteable_type_name
This method was added in Dec 2012, its single use was removed two days
later, and it's been there ever since.
2016-03-05 17:32:08 -05:00
Grzegorz Bizon b3f533c3a7 Escape project's name in cross project label 2016-03-05 16:01:05 +01:00
Douwe Maan 28bee175db Merge branch 'issue_2805' into 'master'
Upgrade carrierwave to 0.10.0.

Closes #2805 

See merge request !3084
2016-03-05 14:48:36 +00:00
Dmitriy Zaporozhets 14df110b78 Merge branch 'issue-sidebar-mobile' into 'master'
Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050
2016-03-05 11:48:21 +00:00
Sytse Sijbrandij efe7a6b04c No options please. 2016-03-04 18:23:55 -08:00
Robert Speicher 0c7626f3a5 Merge branch 'rs-frontmatter-pre' into 'master'
Properly display YAML front matter in Markdown

See merge request !3072
2016-03-05 00:17:58 +00:00
Douwe Maan 2f6ded6df9 Merge branch 'rs-no-default-credentials' into 'master'
Allow the initial admin to set a password

Closes #1980

See merge request !3068
2016-03-04 23:48:56 +00:00
Robert Speicher 8eaeda0816 Add YamlFrontMatterFilter to the PreProcessPipeline
This filter will detect YAML Front Matter and convert it to an HTML
table for prettier formatting.
2016-03-04 18:05:48 -05:00
Robert Speicher 599a6d7873 Allow the initial admin to set a password
Closes #1980
2016-03-04 17:37:57 -05:00
Douwe Maan 92d896183b Merge branch 'rs-organize-factories' into 'master'
Factory cleanup

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/5880

See merge request !2847
2016-03-04 22:27:56 +00:00
Douwe Maan e7c4c22cc1 Merge branch 'rs-update_merge_request' into 'master'
Move `update_merge_request` ability to Developer

Closes #13663

See merge request !3099
2016-03-04 22:26:09 +00:00
Peter Suschlik 6f837df08e Reduce progress bar noise during brakeman run 2016-03-04 22:12:25 +00:00
Douwe Maan 925da3fdf8 Merge branch 'rs-wiki-pipeline-spec' into 'master'
Add a spec for WikiPipeline

Removes the specs from GollumTagsFilter that were more like integration
tests for the pipeline than unit tests of the filter.

See merge request !3054
2016-03-04 21:19:11 +00:00