Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-13Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher
Use ReactiveCaching to update external CI status asynchronously See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055
2016-12-23Fix errorcode 500 on slash commandsZ.J. van de Weg
Coverage was failing, so this could slip through the cracks
2016-12-22Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński
Fix format of Slack when result is nil Closes #25954 See merge request !8248
2016-12-22Fix format of Slack when result is nilZ.J. van de Weg
2016-12-22Fix Mattermost command creation by specifying usernameKamil Trzcinski
2016-12-21Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński
Mattermost slash auto config Closes #24769 See merge request !8070
2016-12-21Improve API specsKamil Trzcinski
2016-12-21Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Kamil Trzcinski
into zj-mattermost-slash-config
2016-12-21Rename MattermostNotificationService back to MattermostServiceDouglas Barbosa Alexandre
2016-12-21Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre
2016-12-20Fix rspec tests due to different APIZ.J. van de Weg
[ci skip]
2016-12-20Fix rubocop errors [ci skip]Z.J. van de Weg
2016-12-20Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski
2016-12-20Work on tests for mattermostKamil Trzcinski
2016-12-20Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński
Add online terminal support for Kubernetes ## What does this MR do? Gives terminal access to kubernetes-deployed environments via the deployment service ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Part of idea to production ## Screenshots (if relevant) ### `/root/reviewing/environments` ![Screen_Shot_2016-12-15_at_19.10.40](/uploads/bd2c54c07b6c85dec3328a20cd185b64/Screen_Shot_2016-12-15_at_19.10.40.png) ### `/root/reviewing/environments/10013` ![Screen_Shot_2016-12-19_at_12.52.39](/uploads/db4e4e06cda88437e8727433d65898b9/Screen_Shot_2016-12-19_at_12.52.39.png) ### `/root/reviewing/enviroments/10013/terminal` ![Screen_Shot_2016-12-15_at_02.35.52](/uploads/1bb77b7e2de2c657ae3bda62dc4f0970/Screen_Shot_2016-12-15_at_02.35.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [X] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? * Closes #22864 #22958 * Alternative to, and somewhat based on, !6770 * Depends on https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/83 See merge request !7690
2016-12-20Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon
Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
2016-12-19Add terminals to the Kubernetes deployment serviceNick Thomas
2016-12-19Improve after feedbackKamil Trzcinski
2016-12-19Fix previously reverted spec failuresKamil Trzcinski
2016-12-19Remove not related spec changesKamil Trzcinski
2016-12-16Merge branch 'expose-deployment-variables' into 'master' Kamil Trzciński
Pass variables from deployment project services to CI runner ## What does this MR do? This commit introduces the concept of deployment variables - variables that are collected from deployment services and passed to CI runner during a deployment build. Deployment services specify the variables by overriding "predefined_variables" method. This commit also configures variables for KubernetesService ## Why was this MR needed? We need these values for https://gitlab.com/gitlab-org/gitlab-ce/issues/23580 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Refers to https://gitlab.com/gitlab-org/gitlab-ce/issues/23580 See merge request !8107
2016-12-16Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski
2016-12-16Fix SlackSlashCommands testsKamil Trzcinski
2016-12-16Create Slack Slash command serviceZ.J. van de Weg
2016-12-16Pass variables from deployment project services to CI runnerAdam Niedzielski
This commit introduces the concept of deployment variables - variables that are collected from deployment services and passed to CI runner during a deployment build. Deployment services specify the variables by overriding "predefined_variables" method. This commit also configures variables for KubernetesService
2016-12-16Fix rubocopKamil Trzcinski
2016-12-15Change SlackService to SlackNotificationsServiceFelipe Artur
2016-12-15Mattermost Notifications ServiceFelipe Artur
2016-12-15Merge branch 'fix-slack-pipeline-message-by-api' into 'master' Kamil Trzciński
Fix Slack pipeline message by API Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609 See merge request !8059
2016-12-15Introduce deployment services, starting with a KubernetesServiceNick Thomas
2016-12-13Fix Slack pipeline message by APILin Jen-Shin
Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609
2016-12-01Merge branch 'rs-include-emailhelpers' into 'master' Rémy Coutable
Only include EmailHelpers in mailer specs and specs using them See merge request !7836
2016-12-01Refactor JiraService by moving code out of JiraService#execute methodAdam Niedzielski
The implicit interface of project services states that the "execute" method is meant to be called when project hooks are executed. Currently JiraService does not support any project events even though JiraService#supported_events says that "commit" and "merge_request" are supported. They are only used to render correct options in JIRA configuration screen, but they are not supported. Because of that, this commit makes "execute" method a no-op.
2016-12-01Only include EmailHelpers in mailer specs and specs using themRobert Speicher
2016-11-21Merge branch 'issue_5541' into 'master' Sean McGivern
Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
2016-11-19Merge branch 'fix-slack-pipeline-event' into 'master' Kamil Trzciński
Fix pipeline author for Slack and use pipeline id for pipeline link [Context](https://gitlab.slack.com/archives/runner-builds/p1479238493000018) Pipeline Slack message: > gitlab-org/gitlab-ci-multi-runner: Pipeline 8bed2a3b of fix/handle-failed-state-while-patching-trace branch by failed in 1389 seconds Quotes: > @godfat Take a look at these notifications, they seems to be missing author and should probably use Pipeline ID instead of SHA See merge request !7506
2016-11-18Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński
Slash command for mattermost Closes #22540 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) See merge request !7438
2016-11-18Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable
Use `Gitlab.config.gitlab.host` over `'localhost'` Use `Gitlab.config.gitlab.host` over `'localhost'` This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all. See merge request !7562
2016-11-18Allow enabling and disabling commit and MR events for JIRAFelipe Artur
2016-11-18Rename mattermost_command to mattermost_slash_commandsKamil Trzcinski
2016-11-18Merge branch 'issue_13232' into 'master' Sean McGivern
Add JIRA remotelinks and prevent duplicated closing messages implements #13232 closes #20479 See merge request !7413
2016-11-18Use `Gitlab.config.gitlab.host` over `'localhost'`Lin Jen-Shin
This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all.
2016-11-18Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur
2016-11-18Improve style, add more testsZ.J. van de Weg
2016-11-18More coverage on service levelZ.J. van de Weg
2016-11-17Merge branch 'jira_service_simplify' into 'master' Sean McGivern
JiraService: simplify url generation Fixes #24085 See merge request !7307
2016-11-16Fix pipeline author for Slack and use pipeline idLin Jen-Shin
rather than using SHA for the pipeline link.
2016-11-16Change the slack notification comment link.Herbert Kagumba
2016-11-12stub not neededJarka Kadlecova
2016-11-12add blank lineJarka Kadlecova