Commit Graph
5139 Commits
Author SHA1 Message Date
James Lopez 30aa37c812 remove spec change 2016-05-16 11:24:20 +02:00
James Lopez 834c953750 fix merge conflicts 2016-05-16 11:22:59 +02:00
James Lopez f386d7a7b7 some changes based on MR feedback 2016-05-16 10:13:00 +02:00
James Lopez 220e55a980 fix spec 2016-05-13 20:58:27 +02:00
James Lopez 1eb802cde3 fixed leaving comments on notes about missing authors 2016-05-13 16:25:27 +02:00
James Lopez a868258269 update json and fix notes issue 2016-05-13 14:17:10 +02:00
James Lopez 25a1c6541a add message to notes about missing author on import 2016-05-13 12:33:13 +02:00
James Lopez 78cd39e480 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-12 14:34:07 +02:00
James Lopez 8165e52045 add author on notes to export - so we can add to a note if project member is not found 2016-05-12 14:27:41 +02:00
James Lopez a61456e44e refactored import to use shared error stuff and fixed a few issues with recent refactorings 2016-05-11 17:22:45 +02:00
James Lopez 6fa529e981 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-10 17:18:04 +02:00
James Lopez a5d59f075a added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver 2016-05-10 17:15:20 +02:00
James Lopez e6fcd6d5bd fixed more import merging issues 2016-05-10 12:30:45 +02:00
James Lopez 47cd14b560 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-09 18:01:06 +02:00
James Lopez 3f87387b6f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
# Conflicts:
#	app/models/project.rb
2016-05-09 12:19:33 +02:00
Dmitriy Zaporozhets 90ae445ba9 Merge branch 'rs-remove-wall_enabled' into 'master'
Remove `wall_enabled` field from Project



See merge request !4089
2016-05-09 10:02:59 +00:00
Rémy Coutable 7d95d3cde7 Merge branch 'trusted-proxies-ip-addr' into 'master'
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

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

See merge request !3970
2016-05-09 09:47:16 +00:00
James Lopez 3aee167dcc fixed issues after refactor, spec passing 2016-05-09 11:10:12 +02:00
Robert Speicher 4bc4f06512 Merge branch 'escape-commit-titles' into 'master'
Escape HTML in commit titles in system note messages

Closes #17348

See merge request !4084
2016-05-08 23:53:49 +00:00
Stan Hu 4a47470feb Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
Fix build notification on merge request page change even if the build status didn't change

## What does this MR do?
This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests.

## Are there points in the code the reviewer needs to double check?
Check implementation

## Why was this MR needed?
Because auf a bug introduced in !3998.

## What are the relevant issue numbers?
#17357

Closes #17357

See merge request !4086
2016-05-08 22:07:40 +00:00
Robert Speicher 0e29653f51 Remove wall_enabled field from Project 2016-05-08 15:47:42 -04:00
Benedikt Huss ed2a7a1ec6 Fix build notification on merge request page change even if the build status didn't change 2016-05-08 21:41:09 +02:00
Stan Hu adf9a51899 Escape HTML in commit titles in system note messages
Closes #17348
2016-05-07 08:41:10 -07:00
Stan Hu 21d89d0286 Update SVG sanitizer to conform to SVG 1.1
Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate
to handle case-sensitive SVG attributes. sanitize parses documents as HTML
instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased.

* SVG element list: https://www.w3.org/TR/SVG/eltindex.html
* SVG attribute list: https://www.w3.org/TR/SVG/attindex.html

Closes #14555
2016-05-06 23:20:24 -07:00
James Lopez 8ac53eb5d0 started refactoring import export reader - WIP 2016-05-06 17:55:06 +02:00
James Lopez 49cdb778a1 few fixes to import specs and code 2016-05-06 15:18:25 +02:00
James Lopez 4290e9c8dd Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
#	lib/gitlab/import_export/import_export.yml
2016-05-06 14:45:15 +02: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
James Lopez ce598b0541 fixed and refactored a few things based on MR feedback 2016-05-06 13:40:02 +02: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
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
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
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
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
James Lopez c1858da9e1 remove spec helper conf 2016-05-05 09:35:27 +02:00
Long Nguyen 91f693c0c4 Update changelog, improve specs 2016-05-05 13:59:09 +07:00
DJ Mountney e37b314567 Add tests for setting trusted_proxies
Each test reloads the trusted_proxies initializer, which in turn will set Rails.application.config.action_dispatch.trusted_proxies to something new. This will leak into the other tests, but the middleware that it is used in has already been loaded for the whole test suite, so it should have no impact.
2016-05-04 15:49:39 -07:00
Benedikt Huss 0e9c2e721b Feedback from stanhu 2016-05-05 00:18:36 +02:00
Benedikt Huss 655b2640ae Merge request widget displays TeamCity build state and code coverage correctly again 2016-05-05 00:07:56 +02:00
Stan Hu 75523d1df9 Sanitize repo paths in new project error message
Closes #17243
2016-05-04 14:06:07 -07:00
Rémy Coutable 1a9d505972 Merge branch 'use-rugged-to-create-tag' into 'master'
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance

This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request.

Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too.

See merge request !3745
2016-05-04 16:07:13 +00:00
James Lopez a4d242b887 refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR 2016-05-04 17:42:02 +02:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'
# Conflicts:
#	Gemfile.lock
2016-05-04 17:27:47 +02:00
Rémy Coutable 209f2f1e6f Use a similar approach to branch creation for tag creation
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Rémy Coutable 44f89eafc0 Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Douwe Maan 466f6874af Merge branch 'create-wikis-during-check' into 'master'
Initialize wikis on legacy projects during check

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173

Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423

See merge request !3931
2016-05-04 14:10:49 +00:00
Douwe Maan 622ad2355a Merge branch 'rs-unique-signup-fields' into 'master'
Improve uniqueness of field names on the signup form

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075

See merge request !3826
2016-05-04 13:33:15 +00:00