summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-5/+3
* Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-142-4/+8
|\
| * 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 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
|\ \ \ | |/ / |/| |
| * | Make API v3 work with the new param nameBob Van Landuyt2017-03-131-0/+1
| * | Rename variableBob Van Landuyt2017-03-131-2/+2
| * | 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
| * | Delegate a single discussion to a new issueBob Van Landuyt2017-03-131-0/+7
| |/
* | 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
|\ \ | |/ |/|
| * 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
* | 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 changesSean McGivern2017-03-101-1/+1
* | | 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 niltc-fix-project-create-500Toon Claes2017-03-101-0/+2
* | | Merge branch 'dm-downtime-check-only-added-files' into 'master' Robert Speicher2017-03-091-1/+1
|\ \ \ | |_|/ |/| |
| * | 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
|\ \
| * | Fix group members method for project import/exportDmitriy Zaporozhets2017-03-091-1/+7
* | | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-092-1/+25
|\ \ \ | |/ / |/| |
| * | 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
| |/ |/|
* | Merge branch 'fix/29093' into 'master' Sean McGivern2017-03-081-1/+1
|\ \ | |/ |/|
| * 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
|\ \
| * | Remove unecessary endpoint from repository, add compatibility endpoints for v...issue_16834Felipe Artur2017-03-073-45/+75
| * | 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 groupsdm-nested-groups-go-getDouwe Maan2017-03-071-9/+57
| |/ /
* | | Merge branch '1381-present-commits-pagination-headers-correctly' into 'master' Douwe Maan2017-03-082-8/+32
|\ \ \
| * | | Returns correct header data for commits endpointOswaldo Ferreira2017-03-072-13/+26
| * | | Fix pagination headers for repository commits api endpointGeorge Andrinopoulos2017-03-072-4/+12
| * | | Manually set total_count when paginating commitsJordan Ryan Reuter2017-03-071-1/+4
| |/ /
* | | Remove user_can_download_artifactsToon Claes2017-03-072-32/+16
* | | Make it possible to query scope as scope[]=Toon Claes2017-03-071-0/+2
* | | Add GET /projects/:id/pipelines/:pipeline_id/jobs endpointToon Claes2017-03-071-0/+17
|/ /
* | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-072-0/+79
* | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-077-19/+27
|\ \
| * | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-037-19/+27