summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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-204-6/+141
|\ \ \ | |/ / |/| |
| * | Improve after feedbackKamil Trzcinski2016-12-192-29/+1
| * | 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/+160
* | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-192-1/+21
|\ \ \ | |_|/ |/| |
| * | Add Wiki import to BB importerValery Sizov2016-12-192-1/+21
* | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-191-0/+27
|\ \ \
| * | | Keep the value type for YAML variablesLin Jen-Shin2016-12-191-1/+0
| * | | Just implement it in the blockLin Jen-Shin2016-12-191-9/+5
| * | | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-1919-265/+432
| |\ \ \ | | |/ /
| * | | 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-151-0/+30
* | | | 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-195-9/+58
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-162-7/+9
| * | | | Implement review comments from @dbalexandre.Timothy Andrew2016-12-161-10/+12
| * | | | Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-161-2/+7
| * | | | Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-161-3/+13
| * | | | Accept environment variables from the `pre-receive` script.Timothy Andrew2016-12-165-8/+38
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18120-625/+2586
|\ \ \ \
| * \ \ \ Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
| |\ \ \ \
| | * | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
| | |/ / /
| * | | | Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
| * | | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-1611-13/+194
| |\ \ \ \ | | |/ / /
| | * | | Rename the `token_has_scope?` method.Timothy Andrew2016-12-161-3/+3
| | * | | Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-161-1/+1
| | * | | Refactor access token validation in `Gitlab::Auth`Timothy Andrew2016-12-161-2/+10
| | * | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-161-1/+0
| | * | | Validate access token scopes in `Gitlab::Auth`Timothy Andrew2016-12-161-3/+11
| | * | | Calls to the API are checked for scope.Timothy Andrew2016-12-161-0/+4
| | |/ /
View Lorry Controller Status