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
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
985af1a670
take nonewline context into account in diff parser
2017-03-13 22:09:43 +02: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
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
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
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
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
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
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
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
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
359f04e8a1
Fix go-get support for projects in nested groups
2017-03-07 19:40:19 -06:00
ec4b03a4c6
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
2017-03-07 15:59:07 -03:00
55f2a5debc
Added Prometheus Service and Prometheus graphs
2017-03-07 16:57:42 +00:00
de37dcee90
Merge branch 'siemens/gitlab-ce-feature/openid-connect'
2017-03-07 16:16:08 +00:00
6a52cda31d
Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token'
2017-03-07 09:29:55 -06:00
8699c8338f
Require explicit scopes on personal access tokens
...
Gitlab::Auth and API::APIGuard already check for at least one valid
scope on personal access tokens, so if the scopes are empty the token
will always fail validation.
2017-03-07 15:00:29 +01:00
eefbc83730
Only use API scopes for personal access tokens
2017-03-07 15:00:29 +01:00
93daeee164
Don't allow blocked users to authenticate through other means
...
Gitlab::Auth.find_with_user_password is currently used in these places:
- resource_owner_from_credentials in config/initializers/doorkeeper.rb,
which is used for the OAuth Resource Owner Password Credentials flow
- the /session API call in lib/api/session.rb, which is used to reveal
the user's current authentication_token
In both cases users should only be authenticated if they're in the
active state.
2017-03-07 15:00:29 +01:00
c498289048
Implement OpenID Connect identity provider
2017-03-07 14:54:35 +01:00
fb4a486605
Merge branch 'feature/runner-jobs-v4-api' into 'master'
...
Feature/runner jobs v4 api
Closes #28513
See merge request !9273
2017-03-07 13:53:26 +00:00
32b09b8847
Add minor refactoring
2017-03-07 12:30:34 +01:00
fb167787f2
Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for-jobs
...
* upstream/master: (289 commits)
re-add Assign to Me link on new MR/Issue forms
thinner bottom header border
make header match old 16px padding of body contents
Update font-awesome-rails to 4.7.0.1
Relax font-awesome-rails dependency to ~> 4.7
Restore keyboard shortcuts for "Activity" and "Charts"
fix border radius bottom for header
match padding for mr-widget sections
Update changelog
Fix project-last-commit alignment
Docs: update GL Pages IP on GL.com
Fix up @DouweM review
Remove readme-only project view preference
Add `uploads` to known models for Import/Export spec
Add `has_many` associations for models that can have Upload records
Handle relative and absolute Upload paths in the Uploaders
Change the default CarrierWave root path for tests
Fix Projects::UploadService spec
Add a Project::UploadsController spec to ensure an Upload is created
Add `RecordsUploads` module to record Upload records via callbacks
...
2017-03-07 16:55:03 +08:00
6b2d4947a6
Merge branch '23948-assign-to-me' into 'master'
...
re-add Assign to Me link on new MR/Issue forms
Closes #23948
See merge request !9499
2017-03-07 07:08:38 +00:00
4f143aa8f2
re-add Assign to Me link on new MR/Issue forms
2017-03-07 16:23:52 +11:00
0ec62b6c5d
Merge branch '26371-native-emojis-v3' into 'master'
...
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
2017-03-07 02:34:48 +00:00
ef24c9ef77
Merge branch 'use-publish-to-post-notifications' into 'master'
...
Use publish channel to post notifications changes
See merge request !9574
2017-03-07 00:39:56 +00:00
DJ Mountney
Douwe Maan
Sean McGivern
Robert Speicher
Sean McGivern
Sam Rose
mhasbini
Rémy Coutable
Adam Niedzielski
Gabriel Mazetto
Toon Claes
http://jneen.net/
Dmitriy Zaporozhets
Kamil Trzciński
Eric Eastwood
Grzegorz Bizon
Douwe Maan
Oswaldo Ferreira
George Andrinopoulos
Douglas Barbosa Alexandre
Markus Koller
Tomasz Maczukin
Lin Jen-Shin
Alfredo Sumaran
Simon Knox
Filipa Lacerda