summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| |/ /
| * | Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-302-27/+7
| |\ \
| | * | Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-14/+4
| | * | Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-301-13/+3
| * | | Don’t create comment on JIRA if link already existsJarka Kadlecova2017-05-301-0/+1
| |/ /
| * | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-291-0/+8
| |\ \ | | |/ | |/|
| | * Add a test for deletion of importing_or_inactive?Shinya Maeda2017-05-291-0/+8
| * | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-297-186/+124
| |\ \
| | * | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-177-186/+124
| * | | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-291-0/+13
| | |/ | |/|
| * | Update spec to match latest EE changesStan Hu2017-05-261-2/+7
| * | Add missing project import job example from gitlab-eeAlejandro Rodríguez2017-05-261-0/+20
* | | Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'Lin Jen-Shin (godfat)2017-05-2612-139/+277
|\ \ \ | |/ /
| * | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-38/+114
| * | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-252-5/+5
| |\ \
| | * | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-232-5/+5
| * | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-251-0/+17
| |\ \ \
| | * | | Add failing test for #32728winh2017-05-251-0/+17
| * | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-4/+4
| |\ \ \ \
| | * | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-4/+4
| * | | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-1/+30
| |\ \ \ \ \
| | * | | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-1/+30
| * | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-255-91/+91
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Implement web hooks loggingAlexander Randa2017-05-255-91/+91
| * | | | | | ensure rss token on readAlexis Reigel2017-05-241-3/+5
| * | | | | | add missing spec for incoming email token presenceAlexis Reigel2017-05-241-0/+7
| * | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-0/+7
| | |/ / / / | |/| | | |
* | | | | | 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 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-243-3/+66
|\ \ \ \ \
| * | | | | Address reviewDouwe Maan2017-05-241-0/+26
| * | | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-232-3/+40
| | |_|/ / | |/| | |
* | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-4/+4
| * | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-232-5/+5
| | |/ / | |/| |
* | | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-232-7/+4
|\ \ \ \