diff options
author | Rémy Coutable <remy@rymai.me> | 2016-08-01 09:04:09 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 09:04:09 +0000 |
commit | f46d5f5813f5c0fe9c88435c8bda9af08447ef16 (patch) | |
tree | 69122c3bee102bfbf144ce19890d93102ccd29bf /spec/factories | |
parent | 7a0ed87b2ccde084f71e7466ded761e9ef19cb5a (diff) | |
parent | 34c1c8a3b14ab3b29fbde97532c89404d9573a1d (diff) | |
download | gitlab-ce-f46d5f5813f5c0fe9c88435c8bda9af08447ef16.tar.gz |
Merge branch 'zj-env-external-url' into 'master'
Add an URL field to Enviroments
## What does this MR do?
Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review.
## Are there points in the code the reviewer needs to double check?
The field is a string on the database, thus limited to 255 chars, which seems more than enough.
## What are the relevant issue numbers?
Closes #19527
## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5469
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/environments.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb index 07265c26ca3..846cccfc7fa 100644 --- a/spec/factories/environments.rb +++ b/spec/factories/environments.rb @@ -3,5 +3,6 @@ FactoryGirl.define do sequence(:name) { |n| "environment#{n}" } project factory: :empty_project + sequence(:external_url) { |n| "https://env#{n}.example.gitlab.com" } end end |