summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-201-1/+1
|\
| * remove build_user from model UserArsenev Vladislav2016-12-181-1/+1
* | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2010-147/+177
|\ \
| * | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-192-4/+4
| * | Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-12/+28
| * | Modify GithubImport to support GiteaRémy Coutable2016-12-197-141/+143
| * | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-194-66/+3
| * | Gogs ImporterKim "BKC" Carlbäcker2016-12-1910-21/+96
* | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-0/+93
|\ \ \
| * | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-192-0/+93
* | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-201-2/+2
|\ \ \ \
| * | | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-201-2/+2
* | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-205-12/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve after feedbackKamil Trzcinski2016-12-193-30/+9
| * | | | Fix RubocopKamil Trzcinski2016-12-181-2/+2
| * | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-162-23/+4
| * | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-161-1/+1
| * | | | Fix specsKamil Trzcinski2016-12-162-5/+10
| * | | | Render format dependent linksKamil Trzcinski2016-12-163-97/+113
| * | | | Use Slack compatible syntaxKamil Trzcinski2016-12-161-4/+4
| * | | | Rename Mattermost::Presenter to PresenterKamil Trzcinski2016-12-162-131/+133
| * | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-163-1/+29
* | | | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-202-15/+19
|\ \ \ \ \
| * | | | | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-projectLin Jen-Shin2016-12-201-3/+6
| * | | | | Prefer unless over if notLin Jen-Shin2016-12-191-1/+1
| * | | | | Use a separate method to skip validationLin Jen-Shin2016-12-192-3/+8
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a...Lin Jen-Shin2016-12-1955-303/+1361
| |\ \ \ \ \
| * | | | | | Give forbidden if project for the build was deletedLin Jen-Shin2016-12-152-15/+11
* | | | | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-193-1/+25
|\ \ \ \ \ \ \
| * | | | | | | Add Wiki import to BB importerValery Sizov2016-12-193-1/+25
* | | | | | | | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-191-0/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add LDAP task to rename a providerDrew Blessing2016-12-161-0/+40
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-192-1/+28
|\ \ \ \ \ \ \
| * | | | | | | Keep the value type for YAML variablesLin Jen-Shin2016-12-192-2/+1
| * | | | | | | Just implement it in the blockLin Jen-Shin2016-12-191-9/+5
| * | | | | | | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-1948-293/+1290
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Rename to Gitlab::Serialize::Ci::VariablesLin Jen-Shin2016-12-162-31/+32
| * | | | | | | Just use YAML.safe_load and assume the formatLin Jen-Shin2016-12-151-23/+3
| * | | | | | | Strictly check the type loaded from YAMLLin Jen-Shin2016-12-151-3/+24
| * | | | | | | Convert CI YAML variables keys into stringsLin Jen-Shin2016-12-152-1/+31
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix MR issue to do with merge userJames Lopez2016-12-191-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-servicesJames Lopez2016-12-192-1/+8
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-191-0/+2
|\ \ \ \ \ \
| * | | | | | Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-191-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-194-10/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Improve how we calculate detailed status group nameGrzegorz Bizon2016-12-161-1/+1
| * | | | | Update status group name for success with warningsGrzegorz Bizon2016-12-161-1/+1
| * | | | | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-163-8/+9
* | | | | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-197-10/+71
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status