summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-191-0/+5
|\
| * fix: commit messages being double-escaped in activies tabamaia2016-10-181-0/+5
* | Merge branch 'dz-refactor-some-specs' into 'master' Sean McGivern2016-10-192-86/+35
|\ \
| * | Refactor group_members_controller_specdz-refactor-some-specsDmitriy Zaporozhets2016-10-192-86/+35
* | | Merge branch 'grapify-commit-statuses-api' into 'master' Rémy Coutable2016-10-191-2/+2
|\ \ \
| * | | Grapify the commit status APIgrapify-commit-statuses-apiRobert Schilling2016-10-191-2/+2
* | | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-191-3/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-141-3/+4
* | | | Merge branch 'sh-improve-merge-service-logging' into 'master' Robert Speicher2016-10-191-2/+2
|\ \ \ \
| * | | | Improve error logging of MergeServiceStan Hu2016-10-181-2/+2
* | | | | Merge branch 'sh-fix-broken-note-award-emoji' into 'master' Robert Speicher2016-10-191-5/+41
|\ \ \ \ \
| * | | | | Add spec for toggling award emoji on issue notessh-fix-broken-note-award-emojiStan Hu2016-10-181-5/+41
| |/ / / /
* | | | | Merge branch 'backport-git-access-spec-changes' into 'master' Douwe Maan2016-10-191-6/+6
|\ \ \ \ \
| * | | | | Backport git access spec changes from EEbackport-git-access-spec-changesSean McGivern2016-10-181-6/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-198-45/+415
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1816-33/+175
| |\ \ \ \
| * | | | | Merge two scenarios into oneKamil Trzcinski2016-10-181-8/+2
| * | | | | Fix remaining offensesKamil Trzcinski2016-10-182-4/+5
| * | | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-0/+46
| * | | | | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-0/+37
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-187-41/+574
| |\ \ \ \ \
| * | | | | | Fix remaining specs failuresKamil Trzcinski2016-10-181-4/+6
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-176-25/+118
| |\ \ \ \ \ \
| * | | | | | | Fix specsKamil Trzcinski2016-10-174-12/+12
| * | | | | | | Fixes typoFilipa Lacerda2016-10-171-1/+1
| * | | | | | | Updates class name for consistencyFilipa Lacerda2016-10-171-4/+4
| * | | | | | | Fix specsKamil Trzcinski2016-10-173-56/+42
| * | | | | | | Fix environments specsKamil Trzcinski2016-10-172-22/+62
| * | | | | | | Work on specsKamil Trzcinski2016-10-173-1/+138
| * | | | | | | Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-171-2/+2
| * | | | | | | Improve after code reviewKamil Trzcinski2016-10-171-0/+62
| * | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-174-8/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '7d12683' into 22191-delete-dynamic-envs-mr [ci skip]Kamil Trzcinski2016-10-172-3/+68
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes broken testsFilipa Lacerda2016-10-112-3/+53
| | * | | | | | | | Adds tests to verify if tabs are renderedFilipa Lacerda2016-10-101-0/+15
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-17147-1039/+3957
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Updates failing testFilipa Lacerda2016-10-061-5/+5
* | | | | | | | | | Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-181-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-0/+34
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dz-spinach-wait-ajax' into 'master' Dmitriy Zaporozhets2016-10-181-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Wait for ajax for every merge request spinach testdz-spinach-wait-ajaxDmitriy Zaporozhets2016-10-181-0/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '23311-fix-double-escaping' into 'master' Sean McGivern2016-10-181-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stop event_commit_title from escaping its outputNick Thomas2016-10-181-0/+17
* | | | | | | | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-185-2/+273
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-1816-74/+706
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1726-65/+494
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Just show the first merge request we found, feedback:Lin Jen-Shin2016-10-142-39/+0
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-14101-877/+2166
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduce Pipeline#merge_requests_with_active_first,Lin Jen-Shin2016-10-142-1/+40
| * | | | | | | | | | | | Space between subject and {, feedback:Lin Jen-Shin2016-10-141-0/+1