summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-161-2/+6
|\ | | | | | | | | Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979
| * Fix config/mail_room.yml to be interpretable RubyDouwe Maan2017-03-151-0/+1
| |
| * Verify config/mail_room.yml is interpretable RubyDouwe Maan2017-03-151-2/+5
| |
* | Merge branch 'dm-copy-code-as-gfm' into 'master' Sean McGivern2017-03-153-19/+8
|\ \ | | | | | | | | | | | | Copy code as GFM from diffs, blobs and GFM code blocks See merge request !9874
| * | Document tag option and clarify specDouwe Maan2017-03-141-4/+3
| | |
| * | Copy code as GFM from diffs, blobs and GFM code blocksDouwe Maan2017-03-143-16/+6
| |/
* | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' Robert Speicher2017-03-151-5/+3
|\ \ | |/ |/| | | | | | | | | Allow resolving conflicts with non-ASCII chars Closes #26214 See merge request !9937
| * Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714
| * | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-141-1/+1
| | | | | | | | | | | | Use options object to pass params for project endpoint
* | | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-142-2/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899
| * | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-132-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-142-4/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705
| * | take nonewline context into account in diff parsermhasbini2017-03-132-4/+8
| | |
* | | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' Rémy Coutable2017-03-141-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix regression in runners registration v1 api See merge request !9904
| * | | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-apiTomasz Maczukin2017-03-131-2/+2
| | | |
* | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-132-13/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Create a new issue for a single discussion See merge request !8266
| * | | Make API v3 work with the new param nameBob Van Landuyt2017-03-131-0/+1
| | | |
| * | | Rename variableBob Van Landuyt2017-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
| * | | Make API v3 compatible with the changes in `Issues::CreateService`Bob Van Landuyt2017-03-131-6/+0
| | | |
| * | | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-131-12/+1
| | | | | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
| * | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-131-0/+7
| |/ / | | | | | | | | | | | | | | | 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.
* | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406Adam Niedzielski2017-03-132-3/+9
| |/ |/|
* | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-135-13/+13
|\ \ | |/ |/| | | | | Refactor/global permissions for internal users See merge request !9598
| * reverse the logic and use a clearer namehttp://jneen.net/2017-03-091-7/+7
| |
| * protect git access through the policy infrahttp://jneen.net/2017-03-091-1/+1
| |
| * use the policy stack to protect loginshttp://jneen.net/2017-03-091-1/+1
| |
| * use a magic default :global symbol instead of nilhttp://jneen.net/2017-03-094-5/+5
| | | | | | | | to make sure we mean the global permissions
* | Using guard clause and added more specs29046-fix-github-importer-open-prsGabriel Mazetto2017-03-102-9/+3
| |
* | Fix GitHub Import for open PRs from a forkGabriel Mazetto2017-03-102-1/+13
| |
* | Merge branch 'fix-500-in-notes-polling' into 'master' Rémy Coutable2017-03-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix notes polling failing after code changes Closes #29327 See merge request !9862
| * | Fix notes polling failing after code changesSean McGivern2017-03-101-1/+1
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9235
* | | Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-101-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841
| * | Fix for creating a project through API when import_url is niltc-fix-project-create-500Toon Claes2017-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'dm-downtime-check-only-added-files' into 'master' Robert Speicher2017-03-091-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Only check new migrations in 'rake downtime_check' See merge request !9785
| * | Only check new migrations in 'rake down_timecheck'dm-downtime-check-only-added-filesDouwe Maan2017-03-081-1/+1
| | |
* | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-091-2/+4
| |/ |/|
* | Merge branch 'dz-nested-groups-members' into 'master' Dmitriy Zaporozhets2017-03-091-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Show members of parent groups on project members page Closes #28786 and #27962 See merge request !9764
| * | Fix group members method for project import/exportDmitriy Zaporozhets2017-03-091-1/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-092-1/+25
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800
| * | Verbosify blocked pipeline status descriptionGrzegorz Bizon2017-03-082-1/+25
| | |
* | | Refactor some code29034-fix-github-importerGabriel Mazetto2017-03-081-2/+6
| | |
* | | Fix name colision when importing GitHub pull requests from forked repositoriesGabriel Mazetto2017-03-081-1/+5
| | |
* | | Fix reference to node_modules in built packageEric Eastwood2017-03-082-2/+5
| |/ |/| | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005
* | Merge branch 'fix/29093' into 'master' Sean McGivern2017-03-081-1/+1
|\ \ | |/ |/| | | | | | | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs Closes #29093 See merge request !9751
| * Fix 'Object not found - no match for id (sha)' when importing GitHub PRsDouglas Barbosa Alexandre2017-03-071-1/+1
| |
* | Merge branch 'issue_16834'Douwe Maan2017-03-073-49/+122
|\ \ | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834Felipe Artur2017-03-073-45/+75
| | | | | | | | | | | | v3 and several improvements
| * | Update API endpoints for raw filesFelipe Artur2017-03-072-31/+74
| | |
* | | Merge branch 'dm-nested-groups-go-get' into 'master' Douwe Maan2017-03-081-9/+57
|\ \ \ | | | | | | | | | | | | | | | | Fix go-get support for projects in nested groups See merge request !9793
View Lorry Controller Status