111e868439
Merge branch 'dm-fix-mailroom-config' into 'master'
...
Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport
See merge request !9979
2017-03-16 00:44:09 +00:00
e5ac06447e
Fix config/mail_room.yml to be interpretable Ruby
2017-03-15 16:21:55 -06:00
4eb24c3161
Verify config/mail_room.yml is interpretable Ruby
2017-03-15 16:21:45 -06:00
ef447a6263
Merge branch 'dm-copy-code-as-gfm' into 'master'
...
Copy code as GFM from diffs, blobs and GFM code blocks
See merge request !9874
2017-03-15 16:26:34 +00:00
0ace54e8bd
Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master'
...
Allow resolving conflicts with non-ASCII chars
Closes #26214
See merge request !9937
2017-03-15 14:57:57 +00:00
96c77bf775
Allow resolving conflicts with non-ASCII chars
...
We wanted to check that the text could be encoded as JSON, because
conflict resolutions are passed back and forth in that format, so the
file itself must be UTF-8. However, all strings from the repository come
back without an encoding from Rugged, making them ASCII_8BIT.
We force to UTF-8, and reject if it's invalid. This still leaves the
problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte
sequences), but isn't. However:
1. If the conflicts contain the problem bytes, the user will see that
the file isn't displayed correctly.
2. If the problem bytes are outside of the conflict area, then we will
write back the same bytes when we resolve the conflicts, even though
we though the encoding was UTF-8.
2017-03-15 11:18:29 +00:00
6685cbeb99
Document tag option and clarify spec
2017-03-14 15:29:00 -06:00
6890327762
Copy code as GFM from diffs, blobs and GFM code blocks
2017-03-14 15:29:00 -06:00
ffcddb2959
Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master'
...
Resolve "Use the v4 API from the frontend"
Closes #28864
See merge request !9714
2017-03-14 15:57:01 +00:00
bdc1a55ede
Merge branch '29389-fix-already-initialized-constants' into 'master'
...
Remove explicit `require` calls, and use `require_dependency` when needed
Closes #29389
See merge request !9899
2017-03-14 15:07:51 +00:00
181c2582fb
Merge branch 'nonewline-parser' into 'master'
...
Take nonewline context into account in diff parser
Closes #28128 and #22636
See merge request !9705
2017-03-14 13:16:26 +00:00
435458d2b1
Update API on frontend to use v4
...
Use options object to pass params for project endpoint
2017-03-14 06:58:20 -04:00
edf29b571f
Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master'
...
Fix regression in runners registration v1 api
See merge request !9904
2017-03-14 02:13:34 +00:00
985af1a670
take nonewline context into account in diff parser
2017-03-13 22:09:43 +02:00
cc4ca1f3fe
Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master'
...
Create a new issue for a single discussion
See merge request !8266
2017-03-13 18:25:25 +00:00
2e1b2233ce
Fix regression in runners registration v1 api
2017-03-13 16:35:10 +01:00
c5e34da01d
Remove explicit `require` calls, and use `require_dependency` when needed
...
See
http://guides.rubyonrails.org/autoloading_and_reloading_constants.html
for more info.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-13 14:29:55 +01:00
47270e1cfd
Backport changes from gitlab-org/gitlab-ee!1406
2017-03-13 12:31:27 +01:00
d1df36e386
Merge branch 'refactor/global-permissions-for-internal-users' into 'master'
...
Refactor/global permissions for internal users
See merge request !9598
2017-03-13 11:04:33 +00:00
92f8277390
Make API v3 work with the new param name
2017-03-13 08:27:52 +01:00
ea70a0d674
Rename variable
...
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
2017-03-13 08:27:52 +01:00
40be92e74c
Make API v3 compatible with the changes in `Issues::CreateService`
2017-03-13 08:27:51 +01:00
f86928953d
Always require MR-iid for resolving discussions
...
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
2017-03-13 08:27:51 +01:00
0267b83898
Delegate a single discussion to a new issue
...
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
a996880bf7
Using guard clause and added more specs
2017-03-10 21:13:45 +01:00
9b53cb6c88
Fix GitHub Import for open PRs from a fork
2017-03-10 21:08:21 +01:00
c4ba6ea684
Merge branch 'fix-500-in-notes-polling' into 'master'
...
Fix notes polling failing after code changes
Closes #29327
See merge request !9862
2017-03-10 18:54:32 +00:00
6ade63977a
Merge branch 'tc-fix-project-create-500' into 'master'
...
Fix for creating a project through API when import_url is nil
Closes #29121
See merge request !9841
2017-03-10 15:56:24 +00:00
394d83ff17
Fix notes polling failing after code changes
...
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9235
2017-03-10 15:41:26 +00:00
c92808ed32
Fix for creating a project through API when import_url is nil
...
The API was returning 500 when `nil` is passed for the `import_url`.
In fact, it was `Gitlab::UrlSanitizer.valid?` which was throwing a
`NoMethodError` when `nil` value was passed.
2017-03-10 10:03:03 +01:00
47cef41e27
Merge branch 'dm-downtime-check-only-added-files' into 'master'
...
Only check new migrations in 'rake downtime_check'
See merge request !9785
2017-03-09 22:41:22 +00:00
90d924dc39
reverse the logic and use a clearer name
2017-03-09 13:59:19 -08:00
145f6fd0b9
protect git access through the policy infra
2017-03-09 11:49:52 -08:00
0ea04cc5bf
use the policy stack to protect logins
2017-03-09 11:49:52 -08:00
846e581732
use a magic default :global symbol instead of nil
...
to make sure we mean the global permissions
2017-03-09 11:49:52 -08:00
dd30946999
Order milestone issues by position ascending in api
2017-03-09 18:43:07 +00:00
ca66799267
Merge branch 'dz-nested-groups-members' into 'master'
...
Show members of parent groups on project members page
Closes #28786 and #27962
See merge request !9764
2017-03-09 13:54:43 +00:00
5b52adcedb
Fix group members method for project import/export
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-09 13:40:57 +02:00
1dc2e185b8
Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master'
...
Verbosify blocked pipeline status description
Closes #29134
See merge request !9800
2017-03-09 10:20:00 +00:00
e4551749c0
Only check new migrations in 'rake down_timecheck'
2017-03-08 17:33:53 -06:00
ce35dcbc81
Refactor some code
2017-03-08 19:42:21 +01:00
26fa716dd2
Fix name colision when importing GitHub pull requests from forked repositories
2017-03-08 19:42:21 +01:00
3403bdc5f2
Fix reference to node_modules in built package
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192
See https://gitlab.slack.com/archives/frontend/p1488973548024005
2017-03-08 10:41:16 -06:00
b51e4cb358
Merge branch 'fix/29093' into 'master'
...
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
Closes #29093
See merge request !9751
2017-03-08 12:56:17 +00:00
7319460c18
Verbosify blocked pipeline status description
2017-03-08 09:10:20 +01:00
04665e938c
Merge branch 'issue_16834'
...
# Conflicts:
# doc/api/v3_to_v4.md
2017-03-07 22:00:23 -06:00
e53fa9605a
Merge branch 'dm-nested-groups-go-get' into 'master'
...
Fix go-get support for projects in nested groups
See merge request !9793
2017-03-08 03:20:04 +00:00
ff9267a707
Merge branch '1381-present-commits-pagination-headers-correctly' into 'master'
...
GET "projects/:id/repository/commits" endpoint improvements
Closes #1381 and #20207
See merge request !9679
2017-03-08 03:05:24 +00:00
d13451cd49
Returns correct header data for commits endpoint
2017-03-07 22:56:31 -03:00
c46f933bb7
Fix pagination headers for repository commits api endpoint
2017-03-07 22:56:31 -03:00
DJ Mountney
Douwe Maan
Sean McGivern
Robert Speicher
Sean McGivern
Sam Rose
Rémy Coutable
mhasbini
Douwe Maan
Tomasz Maczukin
Adam Niedzielski
Bob Van Landuyt
Bob Van Landuyt
Gabriel Mazetto
Toon Claes
http://jneen.net/
George Andrinopoulos
Dmitriy Zaporozhets
Kamil Trzciński
Eric Eastwood
Grzegorz Bizon
Oswaldo Ferreira