summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Validate user id for users select autcompletedz-fix-user-selectDmitriy Zaporozhets2016-10-141-0/+4
| | | | | | | | | | Single user autcomplete should be used only for existing users with digital ID provided. Now js code puts any input into generating user URL which can lead to 500 error because routing like this does not exists: GET "/autocomplete/users/whatever@example.com.json". Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets2016-10-144-42/+60
|\ | | | | | | | | | | | | | | | | | | Add missing routes to make group edits work 6b90ccb9fd changed the routes so that users/groups can be accessed via`/:id`, but the Rails `form_for` method expects to use the `groups#show` path helper for the form action URL. This causes group edits and deletes to fail because the PUT/PATCH/DELETE methods did not exist for `/:id`. This MR adds these methods so that `form_for` continues to work. Closes #23306 See merge request !6874
| * Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets2016-10-144-54/+42
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add specs for group edit and deletionissue-23306-fixStan Hu2016-10-141-0/+26
| |
| * Add missing routes to make group edits workStan Hu2016-10-131-0/+4
| | | | | | | | Closes #23306
* | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-1435-246/+458
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
| * | Tweaked position of badge in panel headingsmembers-uiPhil Hughes2016-10-133-1/+10
| | | | | | | | | | | | Various UI tweaks
| * | Moved how we remove event listenersPhil Hughes2016-10-131-10/+3
| | |
| * | Changed jQuery to be in single linePhil Hughes2016-10-062-6/+1
| | | | | | | | | | | | Removed un-required CSS
| * | Changed how collections are renderedPhil Hughes2016-10-068-824/+15
| | | | | | | | | | | | | | | Used variables in haml for replicated checks Fixed broken conflict
| * | Merge branch 'master' into members-uiPhil Hughes2016-10-06246-1916/+5685
| |\ \
| * | | Updated Ruby variable namePhil Hughes2016-10-053-9/+7
| | | | | | | | | | | | | | | | Fixed Ruby code based on review feedback
| * | | Updated RubyPhil Hughes2016-10-042-3/+4
| | | |
| * | | Merge branch 'master' into members-uiPhil Hughes2016-10-04731-4578/+16663
| |\ \ \
| * | | | Border instead of hrPhil Hughes2016-10-042-2/+6
| | | | |
| * | | | Admin group members UI fixPhil Hughes2016-09-131-1/+1
| | | | |
| * | | | Group links search test fixPhil Hughes2016-09-131-0/+4
| | | | |
| * | | | Added back orderingPhil Hughes2016-09-131-0/+1
| | | | |
| * | | | Ruby updatePhil Hughes2016-09-133-10/+10
| | | | |
| * | | | Removed group members from the list for nowPhil Hughes2016-09-131-25/+0
| | | | |
| * | | | Fixed jQuery chainingPhil Hughes2016-09-131-6/+4
| | | | |
| * | | | Fixed group_links expire date not updating in viewPhil Hughes2016-09-132-2/+2
| | | | |
| * | | | Fixed bug when group_ids not present when creatingPhil Hughes2016-09-131-9/+11
| | | | |
| * | | | Search project groupsPhil Hughes2016-09-132-8/+61
| | | | |
| * | | | Fixed removing groupsPhil Hughes2016-09-133-2/+17
| | | | |
| * | | | Expires in test updatePhil Hughes2016-09-131-1/+1
| | | | |
| * | | | Fixed fields not being sentPhil Hughes2016-09-131-2/+3
| | | | |
| * | | | CSS cleanupPhil Hughes2016-09-136-15/+7
| | | | |
| * | | | JS updatePhil Hughes2016-09-131-9/+11
| | | | |
| * | | | Added test for updating groups permissionsPhil Hughes2016-09-133-4/+41
| | | | |
| * | | | Fixed error when updating groupsPhil Hughes2016-09-131-1/+1
| | | | |
| * | | | Fixed group testsPhil Hughes2016-09-132-2/+2
| | | | |
| * | | | Updated some specsPhil Hughes2016-09-136-24/+24
| | | | | | | | | | | | | | | | | | | | Fixed issue with group name not showing
| * | | | Updated groups member UI to matchPhil Hughes2016-09-136-60/+38
| | | | |
| * | | | Added import button back inPhil Hughes2016-09-132-3/+3
| | | | |
| * | | | Tests updatePhil Hughes2016-09-138-15/+16
| | | | |
| * | | | Fixed searchPhil Hughes2016-09-131-6/+15
| | | | |
| * | | | Fixed issue with invited users not showing upPhil Hughes2016-09-133-8/+19
| | | | |
| * | | | Fixed members errorPhil Hughes2016-09-132-3/+3
| | | | |
| * | | | Return 403 if user can't update groupPhil Hughes2016-09-131-0/+1
| | | | |
| * | | | Removes row from dom when deletingPhil Hughes2016-09-136-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing with buttons Disables group form when user doesnt have correct permissions
| * | | | Mobile spacing improvementsPhil Hughes2016-09-135-20/+41
| | | | |
| * | | | Removed console logPhil Hughes2016-09-132-2/+1
| | | | | | | | | | | | | | | | | | | | Hides time on mobile
| * | | | Mobile improvementsPhil Hughes2016-09-137-24/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Added group name to members row Fixed saving group member
| * | | | Fixed group members not deletingPhil Hughes2016-09-134-9/+14
| | | | | | | | | | | | | | | | | | | | Combine both group members & project members in project members list
| * | | | Fixed issue with groups not displayingPhil Hughes2016-09-132-18/+2
| | | | |
| * | | | Included groups on project_members pagePhil Hughes2016-09-1313-58/+108
| | | | |
| * | | | Updates the member row when values changedPhil Hughes2016-09-133-6/+11
| | | | |
| * | | | Updated members UIPhil Hughes2016-09-139-79/+111
| | | | |
* | | | | Merge branch '22456-option-to-choose-for-no-issue-template' into 'master' Fatih Acet2016-10-143-8/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'No template' functionality to issuable templates ## What does this MR do? Adds dropdown new footer item `.no-template`, when clicked it clears the `currentTemplate`, updates the editor and resets the dropdown toggle text. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-10-10_03.21.45](/uploads/86ae95410807c66ce7b8be63c7ec2c20/2016-10-10_03.21.45.gif) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22456 See merge request !6765
View Lorry Controller Status