summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-024-29/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch ↵Fatih Acet2016-09-012-26/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons' into 'master' Update todo view filter dropdowns ## What does this MR do? Swaps out old `select2` dropdowns on todo page with newer dropdowns. Also removes todo inline JS. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Project ![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif) ### Author ![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif) ### Type ![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif) ### Action ![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21508 Related to #19866 See merge request !6072
| | * | | | | Added todo filter tests21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttonsLuke Bennett2016-09-011-20/+0
| | | | | | |
| | * | | | | Removed select2 from todos feature specLuke Bennett2016-09-011-6/+17
| | | | | | |
| * | | | | | Project tools visibility levelFelipe Artur2016-09-012-3/+5
| |/ / / / /
| * | | | | Fix bug where pagination is still displayed despite all todos marked as doneClement Ho2016-08-311-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-3027-77/+121
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'capitalize-mentioned-issue-notes' into 'master' Douwe Maan2016-08-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize mentioned issue timeline notes ## What does this MR do? Renames `mentioned in` to `Mentioned in` for issue timeline notes ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? Resolves existing UI inconsistency as all the other issue timeline notes have their first letter capitalized. ## What are the relevant issue numbers? Closes #21416 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_10.52.47_AM](/uploads/61de0a7d65fd739a6e565f6e63d2f52d/Screen_Shot_2016-08-25_at_10.52.47_AM.png) After: ![Screen_Shot_2016-08-25_at_10.52.05_AM](/uploads/f67f353c285453306d6b80578b11e587/Screen_Shot_2016-08-25_at_10.52.05_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6028
| | * | | | Capitalize mentioned issue timeline notesClement Ho2016-08-251-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
| | * | | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+0
| | |/ / /
| * | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-223-8/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-195-8/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1518-40/+64
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-022-4/+4
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Fix Spinach branches specfix-spinach-branches-specSean McGivern2016-08-232-0/+6
| | | | | | |
| * | | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-192-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| | * \ \ \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-182-2/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add expiration date to group membershipsSean McGivern2016-08-182-2/+2
| | | | | | |
| | * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1819-44/+68
| | |\ \ \ \ \
| | * | | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-052-2/+2
| | | | | | | |
| * | | | | | | Don't use global variables.ace-venturaConnor Shea2016-08-181-4/+4
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-181-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncated long user lists in award emoji tooltips ## What does this MR do? Truncates award emoji tooltips so that they only show 10 users maximum. Further users are indicated by appending "and X more." ## Are there points in the code the reviewer needs to double check? Is 10 too little, should it be raised? My test cases rely on join() to build the expected output. This feels a little iffy is it alright? ## Why was this MR needed? Some issues have a large number of thumbs causing tooltips to be very large. ## What are the relevant issue numbers? closes #18334, closes #19542 ## Screenshots (if relevant) ##### Before ![Screenshot_from_2016-06-20_19-49-12](/uploads/d7a14dd87bb3da2acd7c0818de99852b/Screenshot_from_2016-06-20_19-49-12.png) ##### After ![Screenshot_from_2016-06-20_19-50-58](/uploads/f7f05c44594bfe8cec7dfd48802753a6/Screenshot_from_2016-06-20_19-50-58.png) Truncation point modified for purposes of screenshot ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4780
| | * | | | | | Award tooltips refer to current user as "You"Jack Davison2016-08-171-1/+1
| | | | | | | |
| * | | | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This older spec was failing: features/project/issues/issues.feature Looks like before we were doing an exact match for queries, that's why it was passing with this existing issue: https://gitlab.com/gitlab-org/gitlab-ce/blob/59fa031e6f7d5a1b658c370f581c4caaf4493150/features/project/issues/issues.feature#L128 Failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/3178231
| * | | | | | Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specsLuke Bennett2016-08-172-0/+4
| | | | | | |
| * | | | | | Removed sleep calls introduced in !5740Luke Bennett2016-08-172-3/+0
| |/ / / / /
| * | | | | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-152-3/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set permissions to admin for importing a project via Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20802 In order to import a project, it is now required to be an admin Moved from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5766 See merge request !1983
| | * | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-112-3/+2
| | | | | |
| * | | | | Remove sleeping and replace escaped text.Connor Shea2016-08-131-6/+6
| | | | | |
| * | | | | Filters test fixPhil Hughes2016-08-131-3/+6
| | | | | |
| * | | | | Fixed filtering testsPhil Hughes2016-08-132-13/+5
| | | | | |
| * | | | | Removed screenshot command :poop:Phil Hughes2016-08-131-3/+0
| | | | | |
| * | | | | Updated failing testsPhil Hughes2016-08-134-0/+23
| | | | | |
| * | | | | Updated testsPhil Hughes2016-08-1311-3/+29
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-122-29/+0
| |\ \ \ \ \
| | * | | | | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-112-29/+0
| | | | | | |
| * | | | | | Fix test failures, that did occur because of missing previously used ↵Kamil Trzcinski2016-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `reload_status!` call
| * | | | | | Use state machine for pipeline event processingKamil Trzcinski2016-08-111-2/+0
| |/ / / / /
| * | | | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
| * | | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-085-5/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (363 commits) Added changelog item for issuable form dropdowns Add 'run tests' docs from GDK Bump gitlab_git to lazy load compare commits Add examples to repository files API (!5465) Ignore URLs starting with // (!5677) Add failing test for #7032 Update timeago to shorter representation Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migration Added guide about migrations and downtime Update CHANGELOG for 8.10.4 Add a data migration to fix some missing timestamps in the members table (again) Move abilities by subject class to a dedicated method Remove unnecessary empty line after css var Set consistency in list text height css Add description to text/plain emails Fix Rename `add_users_into_project` and `projects_ids` fix spec Underscore variable to camelCase using shared path for project import uploads and refactored gitlab remove export worker Structure the development documentation ...
| | * | | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-042-0/+12
| | | |/ / | | |/| |
| | * | | Improve spinach test to be more specific about link to clickStan Hu2016-07-311-1/+1
| | |/ / | | | | | | | | | | | | | | | | If you add another branch to gitlab-test that includes the word 'test', browse_files.feature will fail with an ambiguous match.
| | * | Fix all specs related to changes in !5081.Timothy Andrew2016-07-291-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | 1. Remove `Project#developers_can_push_to_protected_branch?` since it isn't used anymore. 2. Remove `Project#developers_can_merge_to_protected_branch?` since it isn't used anymore.
| | * Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-271-3/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Generate coverage report from whole test suite Extends our CI plan to merge all coverage results and generate HTML report. See merge request !5018
| | | * Introduce SimpleCovEnv singleton helper and use itGrzegorz Bizon2016-07-211-2/+2
| | | |
| | | * Fix spinach testsKamil Trzcinski2016-07-211-1/+1
| | | |
| | | * Update configuration of SimpleCovKamil Trzcinski2016-07-211-0/+1
| | | |