summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Collapse)AuthorAgeFilesLines
* UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-143-17/+21
| | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add request access for groupsRémy Coutable2016-06-141-3/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix profile testAnnabel Dunstone2016-06-101-0/+1
|
* Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-102-10/+10
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* CI build page UI updatePhil Hughes2016-06-101-2/+2
| | | | | Added sidebar Removed elements not present in design
* Fixed failing label subscribe testlabels-ui-fixPhil Hughes2016-06-091-1/+1
|
* Tests updatePhil Hughes2016-06-091-1/+1
|
* Fixed failing testsPhil Hughes2016-06-092-2/+2
|
* Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
| * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-2/+2
| | | | | | | | | | | | | | | | | | - Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
* | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications dropdown on project page now has descriptions ## What does this MR do? Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense. ## What are the relevant issue numbers? Part of #12758 ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png) See merge request !4374
| * | Fixed failing testsPhil Hughes2016-06-071-1/+1
| | |
* | | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-071-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement compact side nav ## What does this MR do? Implements new compact nav design Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268) ## What are the relevant issue numbers? Closes #18013 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png) ![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png) cc @dzaporozhets See merge request !4447
| * | | Remove todos count tests in navAnnabel Dunstone2016-06-071-2/+0
| |/ /
* | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-5/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Ability to prioritize labels Closes #14189 See merge request !4009
| * | Fix failing testsAlfredo Sumaran2016-06-061-5/+5
| | |
* | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-071-16/+0
|\ \ \
| * | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-061-16/+0
| |/ / | | | | | | | | | The buttons were rarely used and added at least 1 query each on every page load.
* | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-063-12/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
| * \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-063-12/+12
| |\ \ \ | | |/ /
| | * | Ensure we are clicking a visible dropdownAlfredo Sumaran2016-06-031-1/+1
| | | |
| | * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-035-13/+17
| | |\ \
| | * | | Incorportate feedbackZ.J. van de Weg2016-06-011-1/+1
| | | | |
| | * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-309-16/+16
| | |\ \ \
| | * | | | Remove old tests, and use right factoriesZJ van de Weg2016-05-252-9/+9
| | | | | |
| | * | | | Merge branch 'master' into awardablesZJ van de Weg2016-05-2521-82/+97
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-185-10/+10
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| | * \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1118-147/+41
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-102-10/+10
| | | | | | | | | |
| * | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-061-1/+1
| | | | | | | | | |
* | | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-034-8/+8
|/ / / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-034-12/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Fix more tests with new Code tabDmitriy Zaporozhets2016-06-033-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Update tests to match new Code tab logicDmitriy Zaporozhets2016-06-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Refactor. Add tests.Josh Frye2016-06-021-0/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-033-3/+3
| | | | | | | |
* | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
|/ / / / / / /
* | | | | | | Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-copGrzegorz Bizon2016-05-301-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | See #17478
* | | | | | Improve note factoryGrzegorz Bizon2016-05-291-1/+1
| | | | | |
* | | | | | Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-292-2/+2
| | | | | |
* | | | | | Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| * | | | | | tests updatePhil Hughes2016-05-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz2016-05-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar and wording in text on various pages. ## What does this MR do? Fixes various grammatical and/or wording issues I found while copyediting on the plane :) ## Why was this MR needed? Incorrect grammar and weird/confusing wording makes the product look less polished and professional. See merge request !4237
| * | | | | | Fix grammar and wording in text on various pages.Connor Shea2016-05-221-2/+2
| | | | | | |
* | | | | | | Merge branch 'rs-rubocop-nottonot' into 'master' Dmitriy Zaporozhets2016-05-257-10/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
| * | | | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-247-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes the note from the development/testing.md guide
* | | | | | | Merge branch 'snippets-ui' into 'master' Jacob Schatz2016-05-242-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated snippets UI ![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png) Closes #14328 See merge request !4194
| * | | | | | | Updated snippets testssnippets-uiPhil Hughes2016-05-192-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'project-settings' into 'master' Jacob Schatz2016-05-241-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project settings UI update ![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png) See merge request !4162