summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-211-3/+1
|
* Fixed notification testsPhil Hughes2016-06-211-2/+2
|
* Escapes branch names before appending to domPhil Hughes2016-06-181-1/+1
|
* Tests fix for ref switcherPhil Hughes2016-06-182-9/+25
|
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-172-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-175-31/+38
| |\
| * | Implement custom notification level optionsFelipe Artur2016-06-151-1/+1
| | |
* | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-172-7/+35
| | |
* | | fixed merge conflicts on UI branchJames Lopez2016-06-167-50/+59
|\ \ \ | | |/ | |/|
| * | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-151-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated commits UI Closes #14633 See merge request !4271
| | * | Updated failing testsPhil Hughes2016-06-081-3/+3
| | | |
| * | | Fix test.Connor Shea2016-06-151-1/+2
| | | |
| * | | Fix admin active tab testsDmitriy Zaporozhets2016-06-152-26/+32
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | 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 spinach testJames Lopez2016-06-161-1/+1
| | |
* | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-06-1352-423/+230
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
| * | Fix profile testAnnabel Dunstone2016-06-101-0/+1
| | |
| * | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-103-14/+18
| | | | | | | | | | | | 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
| * | | Enable Knapsack only in CI environmentknapsack-env-ciKamil Trzcinski2016-06-081-2/+4
| | |/ | |/|
| * | 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 branch 'knapsack' into 'master' Douwe Maan2016-06-071-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Knapsack to evenly distribute specs Try to distribute all tests evenly accross all nodes to reduce the testing time of GitLab CE. This uses high amount of auto-scaled machines. See merge request !4240
| | * \ \ Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-076-37/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitlab-ci.yml
| | * | | | Use knapsack everywhereKamil Trzcinski2016-06-031-1/+1
| | | | | |
| | * | | | Use own version of knapsack which supports spinach testsKamil Trzcinski2016-06-031-1/+3
| | | | | |
| | * | | | WIPKamil Trzcinski2016-06-031-2/+0
| | | | | |
| | * | | | Try to use knapsackKamil Trzcinski2016-06-031-0/+3
| | | | | |
| * | | | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-12/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
| | * | | | | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-12/+0
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-073-25/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-063-25/+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-038-34/+42
| | | |\ \ \ | | | | |/ /
| | | * | | 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-2523-103/+103
| | | |\ \ \ \