summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28917-contain-uploads-in-system-dir' into 'security'Douwe Maan2017-05-313-3/+3
* Revert "Merge remote-tracking branch 'dev/security-9-0' into 9-0-stable"Timothy Andrew2017-05-303-3/+3
* Merge branch '28917-contain-uploads-in-system-dir' into 'security'Douwe Maan2017-05-263-3/+3
* MR shortcuts counter for stableSam Rose2017-04-071-3/+3
* Merge branch 'settings-tab' into 'master' Clement Ho2017-03-102-15/+19
* Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-074-2/+35
|\
| * Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
| |\
| | * Use native unicode emojisEric Eastwood2017-03-061-1/+1
| * | Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-063-1/+34
| |/
* | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-062-5/+7
|/
* Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-042-3/+7
|\
| * Improve explore projects spinach testDmitriy Zaporozhets2017-03-041-2/+6
| * Refactor projects filtering by nameDmitriy Zaporozhets2017-03-031-1/+1
* | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-0/+1
|/
* Cleaning up navigational order - ProjectKushal Pandya2017-03-025-17/+8
* Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-011-0/+4
|\
| * add /award slash commandmhasbini2017-02-281-0/+4
* | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-271-1/+1
|\ \
| * | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-241-1/+1
| |/
* | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-241-13/+11
|\ \ | |/ |/|
| * Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-091-13/+11
* | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-1/+1
* | Enable Style/WordArrayDouwe Maan2017-02-231-1/+1
* | Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-1/+1
* | Enable Performance/RedundantMergeDouwe Maan2017-02-231-1/+1
* | Code style improvementsAlfredo Sumaran2017-02-231-3/+1
* | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-9/+14
|\ \
| * | Todo done clicking is kind of unusable.Jacopo2017-02-171-9/+14
* | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-171-1/+1
|\ \ \
| * \ \ Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-171-32/+0
| |\ \ \
| * | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'Rémy Coutable2017-02-171-91/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Move dashboard issues spinach test to RspecSemyon Pupkov2017-02-101-91/+0
| |/ /
* | | Delete labels spinach test bc covered by rspecAnnabel Dunstone Gray2017-02-151-32/+0
|/ /
* | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'Rémy Coutable2017-02-091-55/+0
|\ \ | |/ |/|
| * Move 'User Snippets' Spinach feature to Rspecthe-undefined2017-01-161-55/+0
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+3
|\ \
| * \ Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-0/+3
| |\ \
| | * | 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
| |/ /
| * | Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-311-7/+0
* | | 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