summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Collapse)AuthorAgeFilesLines
* Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-091-13/+11
| | | | In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+3
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-0/+3
| |\ | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | * Find .merge-request instead of sleep in MR search spec.25624-anticipate-obstacles-to-removing-turbolinksBryce Johnson2017-02-021-1/+3
| | |
| | * Remove turbolinks.Bryce Johnson2017-02-021-0/+1
| | |
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-034-13/+6
|\ \ \ | |/ /
| * | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-033-6/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
| * Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-311-7/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Project#ensure_pipeline changed the args orderLin Jen-Shin2017-01-311-1/+1
| |
* | Fix EE specs after ci_commit rename to pipelineKamil Trzcinski2017-01-311-6/+6
| |
* | Fix adding pages domain to projects in groupsKamil Trzcinski2017-01-311-0/+6
| |
* | Fix broken feature testsKamil Trzcinski2017-01-311-1/+1
| |
* | Update commentsKamil Trzcinski2017-01-311-1/+1
| |
* | Final fixesKamil Trzcinski2017-01-311-11/+11
| |
* | Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski2017-01-311-1/+1
| | | | | | | | | | 1. PagesController is used to show all domains and general overview of Pages 2. PagesDomainsController is used to manage pages domains
* | Added spinach testsKamil Trzcinski2017-01-311-0/+139
| |
* | Add tests for Active TabKamil Trzcinski2017-01-311-0/+8
|/
* Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-301-5/+4
| | | | | | Fixed delete labels not working Review changes
* Present TODO's list without grouping by projectOswaldo Ferreira2017-01-271-18/+27
|
* Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-251-4/+3
|
* Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-204-9/+9
|\ | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * Fixed more testsJose Ivan Vargas2017-01-181-4/+4
| |
| * Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-183-5/+5
| | | | | | | | Added a test for the integrations controller
* | Merge branch ↵Fatih Acet2017-01-191-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
| * Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-101-1/+1
| | | | | | | | | | | | | | | | Grab permissions description from backend Review changes Added unit tests
* | Remove repository trait from factories that don't need it in featuresrs-repository-project-traitRobert Speicher2017-01-178-13/+13
| |
* | Add the `:repository` trait to `:project` factories in Cucumber stepsRobert Speicher2017-01-1719-33/+33
| |
* | Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master' Rémy Coutable2017-01-152-147/+0
|\ \ | | | | | | | | | | | | Move admin groups spinach tests to rspec See merge request !8313
| * | Move admin groups spinach tests to rspecSemyon Pupkov2016-12-272-147/+0
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master' Rémy Coutable2017-01-131-21/+0
|\ \ \ | | | | | | | | | | | | | | | | Move dashboard help spinach test to rspec See merge request !8436
| * | | Move dashboard help spinach test to rspecSemyon Pupkov2017-01-041-21/+0
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master' Rémy Coutable2017-01-131-25/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard group spinach test to rspec See merge request !8434
| * | | | Move dashboard group spinach test to rspecSemyon Pupkov2017-01-041-25/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-131-26/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard archived projects spinach tests to rspec See merge request !8431
| * | | | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-041-26/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master' Rémy Coutable2017-01-131-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard active tab spinach test to rspec See merge request !8423
| * | | | Move dashboard active tab spinach test to rspecSemyon Pupkov2017-01-031-5/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master' Rémy Coutable2017-01-131-167/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move admin users spinach tests to rspec See merge request !8395
| * | | | Move admin users spinach tests to rspecSemyon Pupkov2017-01-021-167/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281
| * | | | Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-2/+4
| |/ / /
* | | | Move admin deploy keys spinach to rspecSemyon Pupkov2017-01-031-59/+0
|/ / /
* | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-0/+59
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-2012-536/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| * \ \ Merge CSSFilipa Lacerda2016-12-125-30/+13
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0611-96/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show write access information when showing the key. TODO: It's ugly right now, need help!
* | | | | Changes after reviewFilipa Lacerda2016-12-211-9/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
* | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-201-104/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin projects spinach tests to RSpec Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !8174
| * | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-191-104/+0
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
View Lorry Controller Status