summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'Kamil Trzciński2017-06-051-6/+90
|\
| * CreatePipelineBuildsService would have created envLin Jen-Shin2017-06-021-30/+0
| * Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-026-93/+280
| |\
| * | Fix a typo: not -> noLin Jen-Shin2017-06-011-1/+1
| * | Merge all environment url methods, introduce ensure_persisted_environmentLin Jen-Shin2017-06-011-25/+38
| * | split tests for expanded_environment_urlLin Jen-Shin2017-06-011-4/+25
| * | Introduce ci_environment_url which would fallbackLin Jen-Shin2017-06-011-6/+18
| * | Just use the url from options, not saving it as a columnLin Jen-Shin2017-06-011-4/+3
| * | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-0116-286/+243
| |\ \
| * \ \ Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'Lin Jen-Shin (godfat)2017-05-2612-139/+277
| |\ \ \
| * | | | Pass external_url from environment if job doesn't have oneLin Jen-Shin2017-05-251-10/+32
| * | | | Add tests for CI_ENVIRONMENT_URLLin Jen-Shin2017-05-251-6/+53
* | | | | Merge branch '33139-lint-our-factories' into 'master'Grzegorz Bizon2017-06-021-4/+6
|\ \ \ \ \
| * | | | | Lint our factories creation in addition to their build33139-lint-our-factoriesRémy Coutable2017-06-021-4/+6
* | | | | | Merge branch '33215-fix-hard-delete-of-users' into 'master'Douwe Maan2017-06-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fix hard-deleting users when they have authored issuesNick Thomas2017-06-021-1/+1
* | | | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-35/+0
|\ \ \ \ \ \ \
| * | | | | | | fix failing specsJarka Kadlecova2017-06-011-35/+0
* | | | | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-012-1/+34
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Explicitly test etag cache invalidationzj-realtime-env-listZ.J. van de Weg2017-06-011-3/+8
| * | | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0122-374/+481
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Test etag cache key changing valueZ.J. van de Weg2017-05-311-0/+12
| * | | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-257-11/+97
| |\ \ \ \ \ \ \
| * | | | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-0/+8
| * | | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-1/+9
* | | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-013-12/+173
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-011-2/+24
| * | | | | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-011-2/+24
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Add test for Project#protected_for?Lin Jen-Shin2017-06-011-0/+37
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-013-20/+18
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Now secret_variables_for would return the variablesLin Jen-Shin2017-06-011-3/+2
| * | | | | | | | | Update docs and use protected secret variable as the nameLin Jen-Shin2017-05-312-8/+23
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3112-213/+178
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2612-139/+277
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge secret and protected vars to variables_for(ref)Lin Jen-Shin2017-05-273-13/+38
| * | | | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-2/+2
| * | | | | | | | | Add tests and also pass protected vars to protected tagsLin Jen-Shin2017-05-252-4/+67
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-012-28/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-312-28/+9
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-011-53/+98
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-011-53/+98
| |/ / / / / / /
* | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-012-51/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix Diff#too_large? and specsDouwe Maan2017-05-301-32/+4
| * | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-292-29/+29
* | | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-313-20/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'tc-improve-project-api-perf' into 'master'Douwe Maan2017-05-312-19/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-301-19/+0
| | * | | | | | | Add starred_by scope to ProjectToon Claes2017-05-301-0/+14
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Fix environment model specs related to protected actionsGrzegorz Bizon2017-05-311-1/+4
| |/ / / / / /
* | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-311-2/+24
|/ / / / / /