Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge dev.gitlab.org master into GitLab.com master | Yorick Peterse | 2019-06-03 | 7 | -27/+35 |
|\ | |||||
| * | Protect Gitlab::HTTP against DNS rebinding attack | Douwe Maan | 2019-05-30 | 7 | -27/+35 |
| | | | | | | | | | | | | Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field. | ||||
* | | Add notify_only_default_branch option to PipelinesEmailService | Peter Marko | 2019-05-28 | 1 | -17/+59 |
|/ | |||||
* | Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specific | Tiger | 2019-05-21 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | When Kubernetes clusters were originally built they could only exist at the project level, and so there was logic included that assumed there would only ever be a single Kubernetes namespace per cluster. We now support clusters at the group and instance level, which allows multiple namespaces. This change consolidates various project-specific fallbacks to generate namespaces, and hands all responsibility to the Clusters::KubernetesNamespace model. There is now no concept of a single namespace for a Clusters::Platforms::Kubernetes; to retrieve a namespace a project must now be supplied in all cases. This simplifies upcoming work to use a separate Kubernetes namespace per project environment (instead of a namespace per project). | ||||
* | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass" | Patrick Derichs | 2019-05-10 | 1 | -0/+7 |
| | |||||
* | Update deployment chat message notification | Jason Goodman | 2019-05-02 | 1 | -5/+8 |
| | | | | | Include link to user and commit title. Rearrange text | ||||
* | Merge branch 'use-keyword-args-for-databuilder-push' into 'master' | Douglas Barbosa Alexandre | 2019-04-29 | 1 | -6/+5 |
|\ | | | | | | | | | Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088 | ||||
| * | Use all keyword args for DataBuilder::Push.build() | Jonathon Reinhart | 2019-04-25 | 1 | -6/+5 |
| | | |||||
* | | Add deployment events to chat notification services | Jason Goodman | 2019-04-26 | 2 | -0/+156 |
|/ | | | | | This enables sending a chat message to Slack or Mattermost upon a successful, failed, or canceled deployment | ||||
* | Add frozen_string_literal to HipChat filesrestore-hipchat | Sean McGivern | 2019-04-10 | 1 | -0/+2 |
| | |||||
* | Fix UrlBlocker spec | Sean McGivern | 2019-04-10 | 1 | -1/+1 |
| | | | | | | | | | | The newer version of HTTParty we now use will try harder to get a valid URL out of a relative one. Unfortunately, when there's no room (as was the case in this spec), the relative URL begins with `//`, which is actually a protocol-relative URL, not a simple path. Adding a room - which will always be the case in 'real life' - fixes this. | ||||
* | Revert "Remove HipChat integration from GitLab" | Sean McGivern | 2019-04-10 | 1 | -0/+408 |
| | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac. | ||||
* | Autocorrect with RSpec/ExampleWording cop | Thong Kuah | 2019-04-05 | 2 | -15/+15 |
| | | | | | | | - rewords examples starting with 'should' - rewords examples starting with 'it' Note: I had to manually fixup "onlies" to "only" | ||||
* | Add # frozen_string_literal to spec/models | Thong Kuah | 2019-04-01 | 35 | -0/+70 |
| | | | | Adds `# frozen_string_literal: true` to spec/models ruby files | ||||
* | Update dashboards to additionally use new environment selector | James Fargher | 2019-03-21 | 1 | -2/+3 |
| | | | | | Deploy boards now will check for app.gitlab.com/env and app.gitlab.com/app | ||||
* | Tweak kubernetes_service_spec for EE compatibility | Tiger | 2019-03-15 | 1 | -2/+5 |
| | |||||
* | Resolve "Mask the existing variables" | Matija Čupić | 2019-03-07 | 1 | -1/+1 |
| | |||||
* | Merge dev master into GitLab.com master | Yorick Peterse | 2019-03-04 | 1 | -18/+43 |
|\ | |||||
| * | Check validity of prometheus_service before query | Reuben Pereira | 2019-03-04 | 1 | -18/+43 |
| | | | | | | | | | | | | | | Check validity before querying so that if the dns entry for the api_url has been changed to something invalid after the model was saved and checked for validity, it will not query. This is to solve a toctou (time of check to time of use) issue. | ||||
* | | Jira: Make issue links title compact | Douglas Barbosa Alexandre | 2019-02-28 | 1 | -1/+2 |
|/ | | | | Port of a community contribution from @glensc to upstream. | ||||
* | Merge branch 'add_YouTrack_integration' into 'master' | Sean McGivern | 2019-02-26 | 1 | -0/+38 |
|\ | | | | | | | | | | | | | Added YouTrack integration Closes #42595 See merge request gitlab-org/gitlab-ce!25361 | ||||
| * | Remove new_issue_url field from YouTrack integration service | Kotau Yauhen | 2019-02-21 | 1 | -3/+0 |
| | | |||||
| * | Fix failed test | Yauhen Kotau | 2019-02-18 | 1 | -1/+1 |
| | | |||||
| * | Added YouTrack integration | Yauhen Kotau | 2019-02-18 | 1 | -0/+41 |
| | | | | | | | | Fixes gitlab-org/gitlab-ce#42595 | ||||
* | | Move ChatOps to Core | James Fargher | 2019-02-20 | 1 | -0/+7 |
|/ | | | | ChatOps used to be in the Ultimate tier. | ||||
* | Remove HipChat integration from GitLab | Nick Thomas | 2019-02-08 | 1 | -408/+0 |
| | |||||
* | Fixed bug when external wiki is enabled | Francisco Javier López | 2019-01-31 | 1 | -21/+0 |
| | | | | | | | | When the external wiki is enabled, the internal wiki link is replaced by the external wiki url. But the internal wiki is still accessible. In this change the external wiki will have its own tab in the sidebar and only if the services are disabled the tab (and access rights) will not be displayed. | ||||
* | Support polymorphism of Bamboo REST API results | Alex Lossent | 2019-01-30 | 1 | -4/+22 |
| | | | | It may return single result or an array of results | ||||
* | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-cop | Rémy Coutable | 2019-01-24 | 1 | -1/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Use revision instead of build number for TC query. | Willi Nesensohn | 2019-01-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'security-2736-prometheus-ssrf' into 'master' | Cindy Pallares | 2018-11-28 | 1 | -0/+17 |
| | | | | | [master] Do not follow redirects in prometheus service See merge request gitlab/gitlabhq!2617 | ||||
* | Add support for surfacing a link to the branch or tag name in push message… | Tony Castrogiovanni | 2018-11-19 | 1 | -12/+53 |
| | |||||
* | Merge branch 'blackst0ne-add-discord-service' into 'master' | Sean McGivern | 2018-11-12 | 2 | -242/+18 |
|\ | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684 | ||||
| * | Fix minor offensesblackst0ne-add-discord-service | blackst0ne | 2018-11-10 | 1 | -1/+1 |
| | | |||||
| * | Refactor specs | blackst0ne | 2018-11-07 | 2 | -460/+11 |
| | | |||||
| * | DRY specs, fix typos in docs | blackst0ne | 2018-11-06 | 2 | -43/+24 |
| | | |||||
| * | Fix frozen strings | blackst0ne | 2018-11-05 | 1 | -0/+2 |
| | | |||||
| * | Add spec for DiscordService | blackst0ne | 2018-11-05 | 1 | -0/+242 |
| | | |||||
* | | Incorporates Kubernetes Namespace into Cluster's flow | Thong Kuah | 2018-11-02 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'sh-fix-hipchat-ssrf' into 'master' | Jan Provaznik | 2018-10-29 | 1 | -0/+18 |
|\ \ | |/ |/| | | | | | [master] Prevent SSRF attacks in HipChat integration See merge request gitlab/gitlabhq!2530 | ||||
| * | Prevent SSRF attacks in HipChat integration | Stan Hu | 2018-10-02 | 1 | -0/+18 |
| | | | | | | | | | | | | | | This change monkey patches the HipChat client to use the GitLab HTTParty connection adapter, which can block access to certain hosts. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51142 | ||||
* | | Correctly process Bamboo API results | Alex Lossent | 2018-10-19 | 1 | -1/+2 |
| | | | | | | | | | | Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786 | ||||
* | | Show available clusters when installed or updated | Peter Leitzen | 2018-10-16 | 1 | -6/+17 |
|/ | | | | | Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed. | ||||
* | Fix activity titles for MRs in chat notification services | Nick Thomas | 2018-09-20 | 1 | -0/+17 |
| | |||||
* | Fix double title in merge request chat messages | Kukovskii Vladimir | 2018-09-11 | 1 | -4/+4 |
| | |||||
* | Move project services log to a separate file | Felipe Artur | 2018-09-06 | 1 | -3/+3 |
| | |||||
* | Add tests for ChatNotificationService#execute | Takuya Noguchi | 2018-08-31 | 1 | -0/+50 |
| | |||||
* | Add JIRA service specs to commit object | Felipe Artur | 2018-08-21 | 1 | -121/+134 |
| | |||||
* | Remove Gemnasium service | Gilbert Roulot | 2018-08-20 | 1 | -74/+0 |
| | |||||
* | Allow multiple JIRA transition ids | Felipe Artur | 2018-08-03 | 1 | -6/+47 |
| |