Commit Graph
24831 Commits
Author SHA1 Message Date
Yorick Peterse 059df2256e Added basic SQL guidelines
[ci skip]
2016-03-08 11:28:50 +01:00
Achilleas Pipinellis a19a9faba9 Merge branch 'doc/ci-api-update' into 'master'
Deprecated GitLab CI API clean up

Deprecated GitLab CI API clean up.

The intent here is to clean up deprecated GitLab CI documentation leaving only relevant information.
Since we merged `Ci::Project` to `Project` most of this documentation is outdated.

Closes #13610 

See merge request !3003
2016-03-08 09:35:10 +00:00
Achilleas Pipinellis 75a67ac0c7 Merge branch 'bundle_clean' into 'master'
add bundle clean to upgrade docs

This MR adds a bundle clean after installing new gems. Bundle clean removes old, not needed gems to keep the system clean.

See merge request !2809
2016-03-08 06:22:23 +00:00
Achilleas Pipinellis 015d7eeae6 Merge branch 'doc-troubleshooting' into 'master'
Added Troubleshooting information for most used services.

This replaces the changes started at gitlab-com/www-gitlab-com!1603

I'd like to add similar troubleshooting information for EE only services, but that needs to happen on a different MR on the EE side. Probably after this one gets merged.

cc @ernstvn @dblessing @balameb @cabargas @kelvinmutuma 

See merge request !3080
2016-03-08 06:14:42 +00:00
Achilleas Pipinellis dc473964e0 Merge branch 'rs-initial-setup-docs' into 'master'
Document changes to the initial admin password

Addresses https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3068#note_4117550

[ci skip]

See merge request !3120
2016-03-08 06:12:50 +00:00
Robert Speicher 9568b4b4f7 Document changes to the initial admin password
[ci skip]
2016-03-07 21:00:53 -05:00
Douwe Maan 2db00dd5e0 Merge branch 'rs-redundant-features' into 'master'
Remove redundant integration tests

These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.

See merge request !3117
2016-03-07 22:05:50 +00:00
Douwe Maan afb8d76f3c Merge branch 'cache-raw-2' into 'master'
Set cache headers for raw blobs

This changes allows browsers and (in the case of public projects)
proxy caches to cache raw Git blob responses.

See merge request !3113
2016-03-07 22:05:15 +00:00
Patricio Cano 406f4a993a Fixed headers for anchors
[ci skip]
2016-03-07 16:29:22 -05:00
Robert Speicher 56c4f22c80 Remove redundant integration tests
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
2016-03-07 15:33:26 -05:00
Douwe Maan 903aa7c95e Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931
2016-03-07 17:18:25 +00:00
Jacob Vosmaer a284d30783 Use Rails etag/cache_control helpers 2016-03-07 16:49:46 +01:00
Christian Mehlmauer a19b4e7529 make cleanup optional 2016-03-07 15:39:12 +01:00
Jacob Vosmaer 41bc9c463c Refactor caching code 2016-03-07 14:27:53 +01:00
Jacob Vosmaer a215e2ee8d Revert changes in the Project model 2016-03-07 14:11:38 +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
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05: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
Rubén Dávila c91554de09 Add link with filter by milestone for labels and avatar.
Closes #13628
2016-03-04 22:37:03 -05:00
Rubén Dávila baa782ac9a Add some spinach specs. 2016-03-04 22:37:03 -05:00
Rubén Dávila 3f2d82485e Add missing partials! 2016-03-04 22:37:03 -05:00
Rubén Dávila 96058605c3 Show some stats about Milestone according to the new UI. 2016-03-04 22:37:03 -05:00
Rubén Dávila 3c157b6bf7 Show Project name on Labels tab for Group and Dashboard context. 2016-03-04 22:37:03 -05:00
Rubén Dávila b6e5de2cfb Use the same partial when rendering Issues or Merge Requests. 2016-03-04 22:37:03 -05:00
Rubén Dávila 7cc102a0e6 Make Merge Requests tab have the same look as Issues. 2016-03-04 22:37:03 -05:00
Rubén Dávila e0a18829ee Show project name for Issues tab in Group and Dashboard context. 2016-03-04 22:37:03 -05:00
Rubén Dávila 32f8fc1f9a Refactor Milestone view for Dashboard. 2016-03-04 22:37:03 -05:00
Rubén Dávila ed48085558 Refactor Merge Requests tab into a custom partial
* Add Labels tab to Groups
* Add decorator for label so it's aware of Milestones.
2016-03-04 22:37:03 -05:00
Rubén Dávila 834b5d49ec Refactor Merge Requests tab into a custom partial 2016-03-04 22:37:03 -05:00
Rubén Dávila e805becfe8 Eager load Issues/MRs project for Milestone.
With this change we avoid doing N+1 queries when viewing Milestone's
Issues/MRs from a Group context.
2016-03-04 22:37:03 -05:00
Rubén Dávila 37d92d0b7b Refactor Merge Requests tab into a custom partial 2016-03-04 22:37:03 -05:00
Rubén Dávila 70028d36be Recator Issues Tab into a custom partial. 2016-03-04 22:37:03 -05:00