summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add docs for request profilingfix/request-profiler-docsAhmad Sherif2016-10-146-1/+20
| | | | Closes #23239
* Merge branch 'gitlab-workhorse-0.8.5' into 'master' Rémy Coutable2016-10-143-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.8.5 ## What does this MR do? Bump gitlab-workhorse to 0.8.5 ## Why was this MR needed? Fixes to the diff and patch endpoints. See https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/68#note_16919390 See merge request !6891
| * Use gitlab-workhorse 0.8.5Nick Thomas2016-10-143-3/+3
| |
* | Merge branch 'remove-period' into 'master' Rémy Coutable2016-10-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a period that can be annoying I looked through the labels, not even `P1` or `customer+` was able to really capture the importance of this MR and what it means for the future of GitLab. ## What does this MR do? It removes the period `.` at the end of the following line in the `Documentation` **Merge Request Template** `See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html.` ## Why was this MR needed? Because, while editing the MR `Description` the link is not clickable, so it is very easy to copy the link with the period `.` and then it ends up behaving like a broken link. I only realized that it was not a broken link because I was busy trying to find someone to fix the broken link. See merge request !6890
| * | remove a period that can be annoyingremove-periodDe Wet Blomerus2016-10-141-1/+1
| | |
* | | Merge branch 'fix-banzai-renderer-instrumentation' into 'master' Yorick Peterse2016-10-142-3/+2
|\ \ \ | | | | | | | | | | | | | | | | Use module_function in Banzai::Renderer See merge request !6886
| * | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentationYorick Peterse2016-10-142-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `extend self` prevents GitLab Performance Monitoring from being able to track class methods. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23347
* | | | Merge branch 'dz-fix-user-select' into 'master' Jacob Schatz2016-10-140-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate user id for users select autcomplete ## What does this MR do? Adds digit validation to user_id when build user autocomplete URL for select2. ## Why was this MR needed? To prevent building invalid URL for non existing users like GET "/autocomplete/users/whatever@example.com.json". As result it fixes failing test: ``` Feature: Admin Groups Scenario: Invite user to a group by e-mail ✔ Given I sign in as an admin # features/steps/shared/authentication.rb:11 ✔ And I have group with projects # features/steps/admin/groups.rb:17 ✔ And User "John Doe" exists # features/steps/shared/user.rb:4 ✔ And I visit admin groups page # features/steps/shared/paths.rb:194 ✔ When I visit admin group page # features/steps/admin/groups.rb:9 ✔ When I select user "johndoe@gitlab.com" from user list as "Reporter" # features/steps/admin/groups.rb:48 ✔ Then I should see "johndoe@gitlab.com" in team list in every project as "Reporter" # features/steps/admin/groups.rb:63 /Users/dzaporozhets/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/johndoe@gitlab.com.json" (ActionController::RoutingError) ``` See merge request !6889
* \ \ \ \ Merge branch 'dz-fix-user-select'Dmitriy Zaporozhets2016-10-141-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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 'cs-really-fix-spinach'Kamil Trzcinski2016-10-143-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Try to fix re-runcs-really-fix-spinachKamil Trzcinski2016-10-141-0/+2
| | | |
| * | | Fix retriesKamil Trzcinski2016-10-141-1/+1
| | | |
| * | | Re-run specs if failedKamil Trzcinski2016-10-143-1/+5
| | | |
| * | | Remove spinach retry.Connor Shea2016-10-144-6/+2
| | | |
* | | | 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
| | | | | | |
View Lorry Controller Status