summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed'...Rémy Coutable2017-03-161-1/+1
|\
| * Fix archive prefix bug for refs containing dotsMark Fletcher2017-03-161-1/+1
* | This quick-fixes an issue with existing award emoji not being valid anymoreRémy Coutable2017-03-161-14/+4
|/
* 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-151-2/+2
|\ \
| * | Copy code as GFM from diffs, blobs and GFM code blocksDouwe Maan2017-03-141-2/+2
| |/
* | 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-141-2/+0
|\ \ \ | |_|/ |/| |
| * | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-131-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
* | | 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-132-8/+8
|\ \ | |/ |/|
| * 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 a magic default :global symbol instead of nilhttp://jneen.net/2017-03-091-1/+1
* | 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
| |/
* | Fix for creating a project through API when import_url is niltc-fix-project-create-500Toon Claes2017-03-101-0/+2
|/
* 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-081-1/+1
* | 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 '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
* | | Returns correct header data for commits endpointOswaldo Ferreira2017-03-071-6/+9
* | | Fix pagination headers for repository commits api endpointGeorge Andrinopoulos2017-03-071-1/+10
|/ /
* | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-0/+70
* | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-3/+11
|\ \
| * | Require explicit scopes on personal access tokensMarkus Koller2017-03-071-1/+4
| * | Only use API scopes for personal access tokensMarkus Koller2017-03-071-2/+7
| * | Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-071-1/+1
| * | Implement OpenID Connect identity providerMarkus Koller2017-03-071-1/+1
* | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-12/+7
|\ \ \ | |/ / |/| |
| * | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-1/+1
| * | refactors finder and correlated codeTiago Botelho2017-03-011-1/+1
| * | applies relevant changes to the code and code structureTiago Botelho2017-02-281-2/+2
| * | add impersonation tokenSimon Vocella2017-02-281-12/+7