summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.10.0.rc5v7.10.0.rc5Job van der Voort2015-04-21153-10393/+0
|
* Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-211-1/+1
| | | | | | | | Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765
* Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-156-0/+171
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-142-0/+125
| |
| * Add feature tests for inviting members.Douwe Maan2015-04-144-0/+46
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-151-2/+1
|\ \
| * | Remove timing dependency on testStan Hu2015-04-141-2/+1
| |/ | | | | | | See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara
* | Revert help link tests removalDmitriy Zaporozhets2015-04-153-0/+12
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* fix failing testHannes Rosenögger2015-04-132-0/+7
|
* The help link has been removed. The commit removes the test for it.Hannes Rosenögger2015-04-133-19/+0
|
* Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-134-3/+122
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * Add admin deploy keys tests.public-deploy-keysDouwe Maan2015-04-032-0/+78
| |
| * Add project deploy keys tests.Douwe Maan2015-04-032-3/+44
| |
* | Move current user to the top of the list in author/assignee filtersStan Hu2015-04-093-0/+25
| | | | | | | | Closes #1321
* | Fix bug where Wiki pages that include a '/' were no longer accessibleStan Hu2015-04-072-0/+60
| | | | | | | | Closes #1363
* | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-041-1/+1
|\ \ | |/ |/|
| * Fix and improve help renderingSullivan SENECHAL2015-04-031-1/+1
| |
* | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-0/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before: ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png) After: ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png) See merge request !407
| * Support configurable attachment size via Application SettingsStan Hu2015-04-022-0/+7
| | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-021-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438
| * Fix tests.Douwe Maan2015-03-271-1/+1
| |
* | Fix adding new members to groupDmitriy Zaporozhets2015-03-302-0/+34
| |
* | Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-292-3/+7
|/
* Fix tests and unassigned filter for issues. Updated CHANGELOGDmitriy Zaporozhets2015-03-276-50/+17
|
* Fix broken side-by-side diff view on merge request pageStan Hu2015-03-252-0/+21
| | | | Closes #1294
* Fix code unfold not working on Compare commits pageStan Hu2015-03-242-0/+15
| | | | Closes #1274
* Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-232-0/+42
|\ | | | | | | | | | | | | | | | | | | | | Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
| * Improve user calendar testimprove-contributions-calendarDmitriy Zaporozhets2015-03-221-3/+1
| |
| * Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-221-1/+1
| |
| * Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-222-0/+44
| |
* | Include missing events and fix save functionality in admin service template ↵Stan Hu2015-03-232-0/+36
| | | | | | | | | | | | settings form Closes #1275
* | Fix "Import projects from" button to show the correct instructionsStan Hu2015-03-222-0/+40
|/ | | | Closes #1267
* Add location to user profileDmitriy Zaporozhets2015-03-201-0/+2
|
* Add tooltip for comment toggle in diff. Add changelog item and fix testsDmitriy Zaporozhets2015-03-181-2/+2
|
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-174-0/+41
|\ | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
| * improve UIValery Sizov2015-03-172-4/+4
| |
| * testsValery Sizov2015-03-164-0/+41
| |
* | Fix failing specs.Douwe Maan2015-03-151-1/+3
| |
* | Use same layout and interactivity for project members as group members.Douwe Maan2015-03-152-9/+14
| |
* | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-152-3/+3
| |
* | Move project members index from `/team` to `/project_members`Douwe Maan2015-03-151-1/+1
| |
* | Use `project_member` instead of `team_member`.Douwe Maan2015-03-151-1/+1
|/
* Implement merge requests searchDmitriy Zaporozhets2015-03-122-0/+11
| | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* Remove tests for un-existing pageDmitriy Zaporozhets2015-03-101-9/+0
|
* Fix tests for project removingDmitriy Zaporozhets2015-03-101-5/+0
|
* Rename dashboard landing page to Your projectsDmitriy Zaporozhets2015-03-101-1/+1
|
* Remove projects page from dashboardDmitriy Zaporozhets2015-03-102-20/+0
|
* Fix test for creating group from dashboardDmitriy Zaporozhets2015-03-104-27/+27
|
* Add tests for starred projects pageDmitriy Zaporozhets2015-03-093-0/+31
|
* Fix dashboard groups testDmitriy Zaporozhets2015-03-081-1/+1
|