summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-161-2/+6
|\
| * 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
|\ \
| * | 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 charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-5/+3
* | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-141-1/+1
|\ \
| * | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-141-1/+1
* | | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-142-2/+0
|\ \ \ | |_|/ |/| |
| * | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-132-2/+0
* | | 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
|\ \ \
View Lorry Controller Status