summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-01 09:04:09 +0000
committerRémy Coutable <remy@rymai.me>2016-08-01 09:04:09 +0000
commitf46d5f5813f5c0fe9c88435c8bda9af08447ef16 (patch)
tree69122c3bee102bfbf144ce19890d93102ccd29bf /spec/factories
parent7a0ed87b2ccde084f71e7466ded761e9ef19cb5a (diff)
parent34c1c8a3b14ab3b29fbde97532c89404d9573a1d (diff)
downloadgitlab-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) ![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png) ## 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.rb1
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