summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-231-0/+24
* Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-211-2/+2
|\
| * Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-211-2/+2
* | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-211-3/+3
|\ \ | |/ |/|
| * Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-211-3/+3
* | Fix error importing label priorities and added relevant specJames Lopez2016-12-211-0/+22
* | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-201-1/+1
* | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-201-1/+1
|/
* Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-207-180/+450
|\
| * Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-191-1/+1
| * Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-0/+94
| * Modify GithubImport to support GiteaRémy Coutable2016-12-196-180/+356
* | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-0/+75
|\ \
| * | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-192-0/+75
* | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-201-0/+7
|\ \ \
| * | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-201-0/+7
* | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-2/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Fix spec failuresKamil Trzcinski2016-12-181-0/+1
| * | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-161-11/+3
| * | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-161-5/+15
| * | | Create Slack Slash command serviceZ.J. van de Weg2016-12-161-2/+24
* | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-192-4/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Add Wiki import to BB importerValery Sizov2016-12-192-4/+11
* | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-191-0/+18
|\ \ \ \
| * | | | Fix tests because now we don't convert valuesfix-yaml-variablesLin Jen-Shin2016-12-191-2/+2
| * | | | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-1913-122/+244
| |\ \ \ \ | | |/ / /
| * | | | Rename to Gitlab::Serialize::Ci::VariablesLin Jen-Shin2016-12-161-1/+1
| * | | | Use described_classLin Jen-Shin2016-12-161-2/+1
| * | | | Just use YAML.safe_load and assume the formatLin Jen-Shin2016-12-151-21/+0
| * | | | Strictly check the type loaded from YAMLLin Jen-Shin2016-12-151-0/+21
| * | | | Convert CI YAML variables keys into stringsLin Jen-Shin2016-12-151-0/+19
* | | | | 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-191-0/+22
| |_|_|/ |/| | |
* | | | Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-192-1/+11
|\ \ \ \
| * | | | updated specJames Lopez2016-12-191-2/+2
| * | | | Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-192-1/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-1912-0/+56
|\ \ \ \
| * | | | Update status group name for success with warningsGrzegorz Bizon2016-12-161-0/+4
| * | | | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-1611-0/+52
* | | | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-192-0/+72
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-161-44/+21
| * | | | Implement review comments from @dbalexandre.Timothy Andrew2016-12-161-5/+45
| * | | | Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-161-0/+19
| * | | | Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-161-0/+36
| |/ / /
* | | | 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
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-169-35/+190
|\ \ \ \ | |/ / /
| * | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-161-23/+45
| |\ \ \ | | |/ / | |/| |
| | * | View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-161-28/+18
View Lorry Controller Status