summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix MembersFinder to never include group invitees.41461-project-members-slow-due-to-sqlAndreas Brandl2018-02-201-1/+1
| | | | | This was the default behavior, because all members with `user_id` set to `null` were excluded.
* Fix N+1 query problem for users on members view.Andreas Brandl2018-02-201-1/+1
| | | | | | | | | | For each member being rendered on Projects::ProjectMembersController#index, there was a query to the users table to retrieve the corresponding user: ``` SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1 ```
* Use DISTINCT ON and translate to MySQL.Andreas Brandl2018-02-201-16/+34
| | | | | | | | Realized window functions are not available in older MySQL versions either. Falling back to DISTINCT ON for postgresql and a convoluted translation for MySQL.
* Simplify database queries in MembersFinder.Andreas Brandl2018-02-201-11/+22
| | | | Closes #41461.
* Merge branch 'remove-unnecessary-validate-project' into 'master'Kamil Trzciński2018-02-202-3/+3
|\ | | | | | | | | Remove unecessary validate: true from belongs_to :project See merge request gitlab-org/gitlab-ce!17166
| * Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-projectDylan Griffith2018-02-202-3/+3
| | | | | | | | This does not seem to serve any clear purpose and causes other issues (see https://gitlab.com/gitlab-org/gitlab-ce/issues/43196#note_59275652)
* | fix broken specsremove-chart-show-bundleMike Greiling2018-02-191-1/+1
| |
* | remove common_d3 bundleMike Greiling2018-02-192-3/+0
| |
* | remove graphs_show webpack bundleMike Greiling2018-02-195-7/+4
| |
* | Chart.html.haml refactorJacob Schatz2018-02-1933-53/+46
| |
* | Resolve "group request membership mail with too long list of "To:""🙈 jacopo beschi 🙉2018-02-192-10/+18
| |
* | Fix single digit value clippingKushal Pandya2018-02-191-1/+1
| |
* | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-192-11/+9
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
| * | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-161-3/+3
| | | | | | | | | | | | # modified: lib/gitlab/git/commit.rb
| * | stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-162-11/+9
| | | | | | | | | | | | | | | | | | | | | When a merge request is merged, it creates a commit with the description of the MR, which may contain references and issue closing references. As this will be handled in the PostMergeService anyways, let's ignore merge commit generated from a MR.
* | | Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-191-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
| * | | Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* | | | Merge branch '41949-move' into 'master'Douwe Maan2018-02-191-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remember assignee when moving an issue See merge request gitlab-org/gitlab-ce!17116
| * | | | Remember assignee when moving an issue41949-moveJan Provaznik2018-02-181-1/+2
| |/ / / | | | | | | | | | | | | Related to #41949
* | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-191-4/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
| * | | Revert "Merge branch ↵Rubén Dávila2018-02-151-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* | | | Merge branch 'revert-215dff76' into 'master'Ian Baum2018-02-171-33/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193
| * | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'"Stan Hu2018-02-161-33/+4
| | | | | | | | | | | | | | | This reverts merge request !16578
* | | | | Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-refDouwe Maan2018-02-161-6/+2
|/ / / /
* | | | Merge branch 'fix-more-dispatcher-stuff' into 'master'Jacob Schatz2018-02-1631-206/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove more route-based chunks from dispatcher.js See merge request gitlab-org/gitlab-ce!16901
| * | | | migrate admin:users:* to static bundlefix-more-dispatcher-stuffMike Greiling2018-02-164-24/+4
| | | | |
| * | | | correct for missing break statement in dispatcher.jsMike Greiling2018-02-162-0/+1
| | | | |
| * | | | alias create and update actions to new and editMike Greiling2018-02-161-4/+11
| | | | |
| * | | | migrate projects:merge_requests:edit to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:merge_requests:creations:diffs to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:merge_requests:creations:new to static bundleMike Greiling2018-02-162-6/+2
| | | | |
| * | | | migrate projects:issues:new and projects:issues:edit to static bundleMike Greiling2018-02-163-16/+2
| | | | |
| * | | | migrate projects:branches:index to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate projects:branches:new to static bundleMike Greiling2018-02-162-11/+3
| | | | |
| * | | | migrate projects:compare:show to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate projects:environments:metrics to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:milestones:* and groups:milestones:* to static bundleMike Greiling2018-02-165-28/+4
| | | | |
| * | | | migrate explore:groups:index to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate explore:projects:* to static bundleMike Greiling2018-02-162-8/+1
| | | | |
| * | | | migrate dashboard:projects:* to static bundleMike Greiling2018-02-162-27/+21
| | | | |
| * | | | migrate admin:jobs:index to static bundleMike Greiling2018-02-161-4/+2
| | | | |
| * | | | migrate dashboard:todos:index to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate groups:merge_requests to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate groups:issues to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate dashboard:merge_requests to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate dashboard:issues to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate dashboard:milestones:show to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate groups:milestones:show to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:milestones:show to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate projects:milestones:index to static bundleMike Greiling2018-02-162-6/+1
| | | | |
View Lorry Controller Status