Commit Graph
12598 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
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
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 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
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
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 599a6d7873 Allow the initial admin to set a password
Closes #1980
2016-03-04 17:37:57 -05: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
Douwe Maan 3231ea10b7 Merge branch 'fix/sentry-1182' into 'master'
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today

For some reason, GoogleBot accesses `/u/:username/calendar_activities` without
a `:date` param, but then the view was trying to call `#to_s(:short)` which
doesn't exist on `nil`, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/

See merge request !3074
2016-03-04 20:59:58 +00:00
Robert Speicher e6204eb3cb Move update_merge_request ability to Developer
Closes #13663
2016-03-04 15:53:25 -05:00
Jacob Schatz ec68d673b2 Merge branch 'ctr-enter-textarea-mac' into 'master'
ctrl+enter on mac correctly submits forms

Closes #4177

See merge request !3089
2016-03-04 20:29:04 +00:00
Jacob Schatz 9cae8dbbfb Uses the correct variable names for this situation. 2016-03-04 14:40:52 -05:00
Jacob Schatz 9afab2963c Only save right sidebar position cookie if user did the collapsing. 2016-03-04 14:31:33 -05:00
Jacob Schatz 8835514b10 Fixes style consistencies. 2016-03-04 13:24:24 -05:00
Jacob Schatz cb73470b93 Merge branch 'dropdown-design-update' into 'master'
Updated dropdown CSS

This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field

![Screen_Shot_2016-03-04_at_12.23.49](/uploads/6f2047ec1b72974334fa56e6895a32be/Screen_Shot_2016-03-04_at_12.23.49.png)

See merge request !3092
2016-03-04 18:05:53 +00:00
Jacob Schatz 1400f19793 Merge branch 'dashboard-search-field-tabindex' into 'master'
Added tabindex to filter field

Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much.

Closes #3706 

See merge request !3093
2016-03-04 14:54:53 +00:00
Jacob Schatz c060823d02 Fix remaining media queries using correct bs paradigms. 2016-03-04 09:06:57 -05:00
Jacob Schatz d98dc53106 Correct media queries for small devices and tablets. 2016-03-04 09:06:57 -05:00
Jacob Schatz 614cd8d12e Sidebar overflow on xs side. 2016-03-04 09:06:57 -05:00
Jacob Schatz 6e6a25187d Combining recent change to have username in header with my MR. 2016-03-04 09:06:57 -05:00
Jacob Schatz cabd228f70 Fix bugs with open and close buttons 2016-03-04 09:06:57 -05:00
Jacob Schatz 61ce134fa9 Small outside aside shrink sidebar button for mobile only. 2016-03-04 09:06:57 -05:00
Jacob Schatz cabb61719d Open sidebar button on mobile. 2016-03-04 09:06:57 -05:00
Jacob Schatz c3e07b6f9c Move static icon and change appearance.
MR meta details media queries.
2016-03-04 09:06:57 -05:00
Jacob Schatz d913febf0f Hide correct author info in header of issuable. 2016-03-04 09:06:57 -05:00
Jacob Schatz 2feb9eb1f0 Change icons for open close on issue/MR
Button full width on phone on MR/issue.
2016-03-04 09:06:57 -05:00
Phil Hughes c10bb7b50a Dropdown caret color in variable 2016-03-04 14:00:04 +00:00
Phil Hughes 298971ed58 Updated CSS so .open doesnt have to be on a dropdown element 2016-03-04 13:49:23 +00:00
Dmitriy Zaporozhets 954b98377f Merge remote-tracking branch 'origin/issue_5854' 2016-03-04 14:29:57 +01:00
Dmitriy Zaporozhets d6f26e41db Merge remote-tracking branch 'origin/sort-starred-projects' 2016-03-04 14:24:22 +01:00
Phil Hughes 144f8eff89 Added tabindex to filter field
Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much
Closes #3706
2016-03-04 12:39:18 +00:00
Phil Hughes 8c0f551f49 Updated dropdown CSS
This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field
2016-03-04 12:20:20 +00:00
Phil Hughes 692773c5a0 ctrl+enter on mac correctly submits forms
Closes #4177
2016-03-04 10:11:15 +00:00
Grzegorz Bizon bf921d084e Invalidate cache for builds badge
Closes #13982
2016-03-04 10:34:35 +01:00
Jacob Schatz f8c4dc9723 Merge branch 'issue_13300' into 'master'
Increase the notes polling timeout over time

Originally by @roperzh at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2821

Fixes #13300 

See merge request !3071
2016-03-04 02:15:34 +00:00