summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Expand)AuthorAgeFilesLines
* List group labels on project labels pageDouglas Barbosa Alexandre2016-10-191-38/+66
* 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
* | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-0/+30
|/ / / / /
* | | | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-171-0/+12
|\ \ \ \ \
| * | | | | Update users routing specDmitriy Zaporozhets2016-10-131-0/+12
* | | | | | Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+42
| |_|_|/ / |/| | | |
* | | | | Merge branch 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add RTL support to markdown rendererEbrahim Byagowi2016-10-161-1/+1
* | | | | Fix broken rspec in compare textStan Hu2016-10-161-1/+1
* | | | | Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-161-1/+1
|/ / / /
* | | | Don't use member properties in users_spec, and remove loading ref.Bryce Johnson2016-10-151-5/+2
* | | | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-3/+3
* | | | Update filled in field for two_factor auth to use id.Bryce Johnson2016-10-151-1/+1
* | | | Shush rubocop.Bryce Johnson2016-10-151-2/+2
* | | | Get tests passing.Bryce Johnson2016-10-151-4/+5