Commit Graph
27851 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2dcd3f29dd Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-06 16:13:35 +02:00
Dmitriy Zaporozhets b1230bbda6 Merge branch 'group-navigation-redesign' into 'master'
Redesign navigation for group pages

Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request 

See merge request !3980
2016-05-06 14:06:02 +00:00
Douwe Maan 0cdd4f310f Merge branch '14564-mr-automatic-title' into 'master'
Auto-set title for branches created from issues

This sets the title for a new MR to 'Resolves "$issue-title"' when:
- The source branch for the MR begins with a value iid.
- The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line).
- The iid does not point to a confidential issue.

Single commit:

![A single commit uses the commit title](/uploads/cd34f59cd67f095c3034fae07950f8b5/image.png)

Multiple commits:

![Multiple commits use the issue title](/uploads/a322c406ddd56913c5aebd88d16e5a5e/image.png)

Confidential issue:

![A confidential issue uses the branch name](/uploads/7ae9b79de5f6101ced46802f3c3a6e71/image.png)

cc @DouweM @zj 

Closes #14564

See merge request !3966
2016-05-06 12:14:13 +00:00
Grzegorz Bizon e65b78c6f1 Merge branch 'remove-unexpected-filtering' into 'master'
Use outer join for issues ordering by milestones due.

This MR contains an implementation for Solution 1 suggested in #14183 

Ordering by Milestone due sooner/later ("milestone sort") filters issues without a milestone, which can let users feel like disappearing issues without a milestone.

See merge request !3872
2016-05-06 11:48:03 +00:00
Sean McGivern 09209725ce Don't auto-set MR title for confidential issues 2016-05-06 12:24:37 +01:00
Sean McGivern e76f339dcd Auto-set title for branches created from issues
If a branch starts with an issue's IID, followed by a hyphen, the
description will be updated to say that is closes the issue. This also
updates the title of the merge request to 'Resolves "$issue-title"', as
long as:
- There is more than one commit in the merge request (if there is only
  one commit, the commit's title will be used as before)
- The issue's IID is valid for the project
2016-05-06 12:24:37 +01:00
Sean McGivern 13d4d3c8b0 Add specs for MergeRequests::BuildService 2016-05-06 12:24:36 +01:00
Douwe Maan 45ef8d5eda Merge branch 'annotate-models' into 'master'
Update annotations on models



See merge request !3962
2016-05-06 11:15:04 +00:00
Takuya Noguchi 0a38eac16e Update CHANGELOG 2016-05-06 20:03:50 +09:00
Takuya Noguchi 4ab49fab94 Use outer join for issues ordering by milestones due. 2016-05-06 19:57:26 +09:00
Douwe Maan aa18cc205c Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into 'master'
Assign labels milestone when moving issue

Closes #14532.

See merge request !3934
2016-05-06 09:15:40 +00:00
Achilleas Pipinellis 622a33e98e Merge branch 'available-memory-req' into 'master'
Add note to requirements doc on swap recommendation, and ensuring enough available memory.

Called out as a result of 2GB RAM DO droplets not being enough to run backups on without adding a swap file. See: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1267

cc\ @stanhu @axil 

See merge request !4060
2016-05-06 09:03:58 +00:00
Stan Hu 1070e0a841 Merge branch 'patch-4' into 'master'
clarify changelog entry on GitHub Enterprise import support

/cc @stanhu 

See merge request !4066
2016-05-06 08:08:24 +00:00
Ben Bodenmiller b8b54252fd clarify changelog entry on GitHub Enterprise import support 2016-05-06 07:54:00 +00:00
Zeger-Jan van de Weg 8278b763d9 Auto annotate models on migration
[ci skip]
2016-05-06 09:07:35 +02:00
Zeger-Jan van de Weg 47da013cf8 Annotate the models 2016-05-06 08:27:46 +02:00
Robert Speicher 00acdcf78f Merge branch 'cascade_drop' into 'master'
Rake drop tables with cascade

See merge request !4020
2016-05-06 01:54:13 +00:00
Robert Speicher 4fce876542 Merge branch 'fix/import-url-issues' into 'master'
Fix importer bug when throwing exceptions

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681

See merge request !3941
2016-05-05 22:27:40 +00:00
Robert Speicher 9864b2dbc5 Merge branch 'rs-each-arg' into 'master'
Add a note to testing docs about the `:each` argument to RSpec hooks

[ci skip]

See merge request !4061
2016-05-05 21:36:58 +00:00
Robert Speicher df9a7c6b4a Add a note to testing docs about the :each argument to RSpec hooks
[ci skip]
2016-05-05 17:22:18 -04:00
DJ Mountney d6f67dba01 Add note to requirements doc on swap recommendation, and ensuring enough available memory. 2016-05-05 13:46:58 -07:00
Robert Speicher 56c49f4fb5 Merge branch 'tag-exists' into 'master'
Use tag_exists? in GitAccess#protected_tag?

This will fail until https://gitlab.com/gitlab-org/gitlab_git/merge_requests/81/ is merged. Adding this should speed up checking for tags in `Gitlab::GitAccess` as it no longer needs to retrieve the entire list of tags.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/14280 for more information.

See merge request !3983
2016-05-05 18:35:24 +00:00
Annabel Dunstone 00b3eedf7c Remove duplicate cover-control mobile styles 2016-05-05 12:55:01 -05:00
Yorick Peterse 003671207d Fix passing nil to protected_tag?
Previously this method would directly receive the output of tag_name().
This method could either return a String or nil. In the previous setup
this would somehow magically work but because Rugged::TagCollection#[]
doesn't accept nil values it started to fail.

To work around this the elsif in change_access_check() assigns the
result of tag_name() to a local and then _only_ calls protected_tag?()
if the tag name is not nil. The extra parenthesis are put in place to
ensure that things are parsed correctly, without these the code would be
parsed as follows:

    elsif tag_ref = (tag_name(ref) && protected_tag(tag_ref))

During runtime this would basically resolve to:

    elsif tag_ref = (tag_name(ref) && protected_tag(nil))

This is because when you refer to the variable you're assigning _in_ the
assignment Ruby returns nil instead of raising an error.
2016-05-05 19:46:26 +02:00
Yorick Peterse 93ce229665 Use tag_exists? in GitAccess#protected_tag?
This removes the need for retrieving the entire list of tags just to
check if a specific one exists.
2016-05-05 19:46:26 +02:00
Yorick Peterse 6e47a1924b Updated gitlab_git to 10.1.0 2016-05-05 19:46:26 +02:00
Yorick Peterse e1c11241f4 Merge branch 'fix-changelog-3880' into 'master'
Moved entry for !3880 to 8.7.2

See merge request !4058
2016-05-05 17:42:39 +00:00
Yorick Peterse 0cf59281cd Moved entry for !3880 to 8.7.2
Apparently this was already released in 8.7.2 but no changelog entry was
added.

[ci skip]
2016-05-05 19:40:27 +02:00
Yorick Peterse 48a0e6878c Merge branch 'mr3931-changelog' into 'master'
Added CHANGELOG entries for !3880 and !3931

See merge request !4057
2016-05-05 17:34:38 +00:00
Yorick Peterse d04146b0e0 Added CHANGELOG entry for merge request !3880
[ci skip]
2016-05-05 19:33:55 +02:00
Yorick Peterse 8159555491 Added CHANGELOG entry for merge request !3931
[ci skip]
2016-05-05 19:31:25 +02:00
Robert Speicher a70b57b73c Merge branch 'bump-sidekiq-4.1.2' into 'master'
Upgrade Sidekiq to 4.1.2

Fixes a memory leak: https://github.com/mperham/sidekiq/commit/a2bdb875fe495bc28b1bee80120e4a5641ca0731

See merge request !4056
2016-05-05 17:16:54 +00:00
Stan Hu 280ea4f600 Upgrade Sidekiq to 4.1.2 2016-05-05 09:17:46 -07:00
Douwe Maan 36afec5fcf Merge branch 'gh-review-comments' into 'master'
Fix the line code when importing PR review comments from GitHub

Pull Request Review Comments are comments on a portion of the unified diff.

Closes #17205

See merge request !4010
2016-05-05 15:03:56 +00:00
Dmitriy Zaporozhets 5a8b8ba6c7 Fix group settings dropdown for group members and visitors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:37:41 +02:00
Dmitriy Zaporozhets 4bef939e27 Remove group rss icon since it depends on context and duplciates on other pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-05 16:31:19 +02:00
Annabel Dunstone c24958365f Remove mobile styles; horizontally scroll layout nav links 2016-05-05 09:00:29 -05:00
Douglas Barbosa Alexandre 3bf43e7c27 Update CHANGELOG 2016-05-05 10:47:08 -03:00
Douglas Barbosa Alexandre 6fbf6b2936 Fix the line code when importing PR review comments from GitHub
Pull Request Review Comments are comments on a portion of the unified
diff.
2016-05-05 10:45:14 -03:00
Jacob Schatz 0bdb68ef60 Merge branch '15179-builds-redesign' into 'master'
15179 builds page redesign

Closes #15179   

<img src="/uploads/d9ec515e500dc9023d588b5c38636a86/Screen_Shot_2016-04-26_at_1.35.11_PM.png" width="800px">

Updated screenshot:   
<img src="/uploads/63109057ee271d788ab726e52acf9328/Screen_Shot_2016-05-04_at_9.23.01_AM.png" width="800px">

Updated screenshot with count badges instead of parentheses:  
<img src="/uploads/d9cd91b079d23c63601c8dbcf4803c8d/Screen_Shot_2016-05-05_at_7.40.48_AM.png" width="800px">

See merge request !3935
2016-05-05 13:39:28 +00:00
Douwe Maan 1c65019742 Merge branch 'stanhu/gitlab-ce-bump-mailroom' 2016-05-05 14:34:04 +02:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Yorick Peterse c583433862 Merge branch 'teamcity-changelog-fix' into 'master'
Moved TeamCity changelog entry to 8.7.3

See merge request !4049
2016-05-05 08:14:41 +00:00
Yorick Peterse 92ed02c548 Moved TeamCity changelog entry to 8.7.3
[ci skip]
2016-05-05 10:13:13 +02:00
Long Nguyen e016cdb73e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_14532_assign_labels_milestone_when_moving_issue 2016-05-05 15:02:46 +07:00
Long Nguyen 91f693c0c4 Update changelog, improve specs 2016-05-05 13:59:09 +07:00
Stan Hu f5ae92d81c Merge branch 'log-impersonation-events' into 'master'
Log to application.log when an admin starts and stops impersonating a user

Closes gitlab-org/gitlab-ee#536

See merge request !4028
2016-05-05 04:08:45 +00:00
Rémy Coutable 2cf8564cfe Merge branch 'new-badge-url' into 'master'
Use new build badge URLs

Use new build badge URLs to follow the instruction at [the project badges](https://gitlab.com/gitlab-org/gitlab-ce/badges).

See merge request !4037
2016-05-05 02:25:25 +00:00
Stan Hu bee002270d Merge branch 'fix-team-build-state-in-mr-widget' into 'master'
Merge request widget displays TeamCity build state and code coverage correctly again

## What does this MR do?
This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer.

## Are there points in the code the reviewer needs to double check?
The changes are quite simple, so please simply double check them.

## Why was this MR needed?
This MR is needed to make the TeamCity build status working again.

## What are the relevant issue numbers?
#17080 

See merge request !3998
2016-05-04 23:47:36 +00:00
Stan Hu 5653a71635 Merge branch 'rs-repository-size-format' into 'master'
Use `number_to_human_size` helper to show repository size

This will intelligently format large repository sizes in GBs (or,
shudder, TBs).

Also, removes `rescue` clause from `repository_size` helper.
The repository size has since become calculated (and cached)
more intelligently, and this should no longer be necessary.

See merge request !4047
2016-05-04 22:54:25 +00:00