summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-201-25/+28
|\
| * Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-201-25/+28
* | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-201-0/+14
|\ \ | |/ |/|
| * Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-0/+14
* | Differentiate the expire from leave eventCallum Dryden2016-10-201-0/+41
|/
* Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-192-36/+64
|\
| * Update specs to cope with new label types and prioritiesJames Lopez2016-10-191-0/+0
| * Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-191-4/+4
| * Fix import testJames Lopez2016-10-191-0/+0
| * Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-5/+5
| * Update project test file for project import integration testDouglas Barbosa Alexandre2016-10-191-0/+0
| * List group labels on project labels pageDouglas Barbosa Alexandre2016-10-191-38/+66
* | Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-...Robert Speicher2016-10-191-0/+8
|\ \ | |/ |/|
| * Added `issuable_filters_present` to check for active filters before rendering...22457-reset-filters-button-should-be-invisible-when-no-filters-are-activeLuke Bennett2016-10-071-0/+8
* | 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 '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-193-41/+126
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-1/+32
| |\ \
| * | | Merge two scenarios into oneKamil Trzcinski2016-10-181-8/+2
| * | | Fix remaining offensesKamil Trzcinski2016-10-181-1/+1
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-14/+123
| |\ \ \
| * | | | 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-172-0/+54
| |\ \ \ \
| * | | | | Fix specsKamil Trzcinski2016-10-171-9/+9
| * | | | | 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-171-19/+57
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-171-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ 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-1722-75/+500
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Updates failing testFilipa Lacerda2016-10-061-5/+5
* | | | | | | | Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-181-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove unnecessary retried check & fix test failuresAnnabel Dunstone Gray2016-10-181-1/+1
* | | | | | | | Merge branch 'fix/pipeline-settings-page' into 'master' Kamil Trzciński2016-10-181-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Move specs for project pipeline settings pageGrzegorz Bizon2016-10-181-0/+0
| * | | | | | | Reload pipeline settings when saving new settingsGrzegorz Bizon2016-10-181-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-181-14/+123
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-181-14/+123
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1714-59/+233
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-49/+96
| | * | | | | Improve diff view switching and componentsAlfredo Sumaran2016-10-131-5/+5
| | * | | | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-1/+37
| | * | | | | Refactor JS codeAlfredo Sumaran2016-10-131-2/+2
| | * | | | | Fix editor specSean McGivern2016-10-131-0/+1
| | * | | | | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| | * | | | | We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0