summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '14564-mr-automatic-title' into 'master' Douwe Maan2016-05-062-6/+211
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Don't auto-set MR title for confidential issuesSean McGivern2016-05-062-2/+11
| |
| * Auto-set title for branches created from issuesSean McGivern2016-05-062-7/+57
| | | | | | | | | | | | | | | | | | | | 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
| * Add specs for MergeRequests::BuildServiceSean McGivern2016-05-061-0/+146
| |
* | Merge branch 'remove-unexpected-filtering' into 'master' Grzegorz Bizon2016-05-063-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Update CHANGELOGTakuya Noguchi2016-05-061-0/+1
| | |
| * | Use outer join for issues ordering by milestones due.Takuya Noguchi2016-05-062-2/+5
| | |
* | | Merge branch 'annotate-models' into 'master' Douwe Maan2016-05-0673-323/+529
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Update annotations on models See merge request !3962
| * | Auto annotate models on migrationannotate-modelsZeger-Jan van de Weg2016-05-061-0/+44
| | | | | | | | | | | | [ci skip]
| * | Annotate the modelsZeger-Jan van de Weg2016-05-0672-323/+485
| | |
* | | Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into ↵Douwe Maan2016-05-063-8/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Assign labels milestone when moving issue Closes #14532. See merge request !3934
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-05227-1341/+3520
| |\ \ \ | | | | | | | | | | | | | | | issue_14532_assign_labels_milestone_when_moving_issue
| * | | | Update changelog, improve specsLong Nguyen2016-05-053-5/+9
| | | | |
| * | | | Update changelogLong Nguyen2016-04-281-1/+1
| | | | |
| * | | | Add changelogLong Nguyen2016-04-281-0/+1
| | | | |
| * | | | Fix rubocopLong Nguyen2016-04-281-2/+1
| | | | |
| * | | | Code refactor and fix broken specLong Nguyen2016-04-282-8/+18
| | | | |
| * | | | Update specsLong Nguyen2016-04-271-9/+4
| | | | |
| * | | | Allow to assign labels and milestone to target project when moving issueLong Nguyen2016-04-262-1/+30
| | | | |
* | | | | Merge branch 'available-memory-req' into 'master' Achilleas Pipinellis2016-05-061-1/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add note to requirements doc on swap recommendation, and ensuring enough ↵available-memory-reqDJ Mountney2016-05-051-1/+8
| | | | | | | | | | | | | | | | | | | | available memory.
* | | | | Merge branch 'patch-4' into 'master' Stan Hu2016-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify changelog entry on GitHub Enterprise import support /cc @stanhu See merge request !4066
| * | | | | clarify changelog entry on GitHub Enterprise import supportBen Bodenmiller2016-05-061-1/+1
|/ / / / /
* | | | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-061-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rake drop tables with cascade See merge request !4020
| * | | | | Rake drop tables with cascadeDrew Blessing2016-05-031-1/+4
| | | | | |
* | | | | | Merge branch 'fix/import-url-issues' into 'master' Robert Speicher2016-05-052-7/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importer bug when throwing exceptions Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681 See merge request !3941
| * | | | | | fix failing specfix/import-url-issuesJames Lopez2016-04-281-5/+4
| | | | | | |
| * | | | | | added spec testing exception raisedJames Lopez2016-04-281-6/+21
| | | | | | |
| * | | | | | fix var errorJames Lopez2016-04-271-1/+1
| | | | | | |
* | | | | | | Merge branch 'rs-each-arg' into 'master' Robert Speicher2016-05-051-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to testing docs about the `:each` argument to RSpec hooks [ci skip] See merge request !4061
| * | | | | | Add a note to testing docs about the `:each` argument to RSpec hooksRobert Speicher2016-05-051-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'tag-exists' into 'master' Robert Speicher2016-05-053-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Fix passing nil to protected_tag?tag-existsYorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Use tag_exists? in GitAccess#protected_tag?Yorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for retrieving the entire list of tags just to check if a specific one exists.
| * | | | | | Updated gitlab_git to 10.1.0Yorick Peterse2016-05-052-1/+3
|/ / / / / /
* | | | | | Merge branch 'fix-changelog-3880' into 'master' Yorick Peterse2016-05-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved entry for !3880 to 8.7.2 See merge request !4058
| * | | | | | Moved entry for !3880 to 8.7.2Yorick Peterse2016-05-051-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this was already released in 8.7.2 but no changelog entry was added. [ci skip]
* | | | | | Merge branch 'mr3931-changelog' into 'master' Yorick Peterse2016-05-051-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CHANGELOG entries for !3880 and !3931 See merge request !4057
| * | | | | | Added CHANGELOG entry for merge request !3880Yorick Peterse2016-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Added CHANGELOG entry for merge request !3931Yorick Peterse2016-05-051-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'bump-sidekiq-4.1.2' into 'master' Robert Speicher2016-05-052-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.1.2 Fixes a memory leak: https://github.com/mperham/sidekiq/commit/a2bdb875fe495bc28b1bee80120e4a5641ca0731 See merge request !4056
| * | | | | | Upgrade Sidekiq to 4.1.2Stan Hu2016-05-052-2/+3
|/ / / / / /
* | | | | | Merge branch 'gh-review-comments' into 'master' Douwe Maan2016-05-053-21/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-05-051-0/+1
| | | | | | |
| * | | | | | Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-052-21/+30
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Pull Request Review Comments are comments on a portion of the unified diff.
* | | | | | Merge branch '15179-builds-redesign' into 'master' Jacob Schatz2016-05-0558-96/+160
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Revert counter parentheses back to badges15179-builds-redesignAnnabel Dunstone2016-05-0412-50/+45
| | | | | | |
| * | | | | | Change build icons into buttons; update testsAnnabel Dunstone2016-05-048-25/+22
| | | | | | |
| * | | | | | Builds page redesignAnnabel Dunstone2016-05-0415-36/+75
| | | | | | |
| * | | | | | Start builds redesignAnnabel Dunstone2016-05-0455-85/+118
| | | | | | |