summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07334-669/+1047
|\
| * Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into '...Sean McGivern2017-08-041-27/+70
| |\
| | * Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messagesShinya Maeda2017-08-041-2/+2
| | * Fix specShinya Maeda2017-08-041-1/+3
| | * Add a spec for concurrent processShinya Maeda2017-08-041-27/+68
| * | Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run...Sean McGivern2017-08-041-0/+19
| |\ \
| | * | Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_atShinya Maeda2017-08-041-7/+3
| | * | fixShinya Maeda2017-08-041-0/+23
| | |/
| * | Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-043-12/+41
| |\ \ | | |/ | |/|
| | * fixed up specsPhil Hughes2017-07-281-6/+14
| | * trying to fix teststauriedavis2017-07-281-1/+12
| | * try and fix some teststauriedavis2017-07-282-5/+15
| * | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-031-0/+8
| |\ \
| | * | Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-031-0/+8
| * | | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-02170-211/+211
| |/ /
| * | Merge branch 'rs-empty_project-cleanup' into 'master'Rémy Coutable2017-08-027-8/+8
| |\ \
| | * | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-017-8/+8
| * | | Add filtered search to group issue dashboardClement Ho2017-08-021-5/+5
| |/ /
| * | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-013-29/+29
| |\ \
| | * | Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-011-1/+1
| | * | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-012-28/+28
| * | | Inline script cleanup globals and easyTim Zallmann2017-08-011-2/+2
| |/ /
| * | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| * | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'ma...Robert Speicher2017-07-282-17/+5
| |\ \
| | * | Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
| | * | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-11/+1
| | |/
| * | Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
| |\ \
| | * | Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
| | |/
| * | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-0/+27
| |\ \ | | |/ | |/|
| | * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-0/+27
| * | Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
| |\ \
| | * | Use `empty_project` where possible in spec/features/securityrs-empty_project-featuresRobert Speicher2017-07-276-6/+9
| | * | Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher2017-07-2729-42/+42
| | * | Use `empty_project` where possible in spec/features/issuesRobert Speicher2017-07-2718-30/+30
| | * | Use `empty_project` where possible in spec/features/projectsRobert Speicher2017-07-2773-97/+95
| | * | Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
| | * | Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
| | * | Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
| | * | Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
| | * | Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
| | * | Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
| | * | Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
| | |/
| * | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-1/+1
| |\ \
| | * | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-1/+1
| * | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+11
| |\ \ \
| | * | | Remove unnecessary codeHiroyuki Sato2017-07-261-1/+0
| | * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23361-5296/+15076
| | |\ \ \
| | * | | | Refactor specHiroyuki Sato2017-03-091-2/+2
| | * | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-1/+11
| * | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-0/+5
| |\ \ \ \ \