summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '22188-drop-down-filter-for-project-snippets' into 'master'Fatih Acet2018-10-0513-8/+72
|\ | | | | | | | | | | | | Resolve "Drop down filter for project snippets" Closes #22188 See merge request gitlab-org/gitlab-ce!21458
| * Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-0513-8/+72
|/
* Merge branch 'ce-issue_1984' into 'master'Sean McGivern2018-10-052-67/+82
|\ | | | | | | | | Backport CE changes from draft_notes addition in EE See merge request gitlab-org/gitlab-ce!22125
| * Backport CE changes from draft_notes addition in EEMario de la Ossa2018-10-042-67/+82
| |
* | Merge branch '50904-remove-icon-env' into 'master'Grzegorz Bizon2018-10-053-11/+0
|\ \ | | | | | | | | | | | | Removes icon key from job endpoint See merge request gitlab-org/gitlab-ce!22085
| * | Delete 50904-remove-icon-env.ymlGrzegorz Bizon2018-10-051-5/+0
| | |
| * | Removes icon key from job endpointFilipa Lacerda2018-10-044-11/+5
| | | | | | | | | | | | | | | | | | | | | This was added because we thought we'd need to render the environment status but we already have this information in the build status
* | | Merge branch 'epics-e2e-tests' into 'master'Grzegorz Bizon2018-10-058-9/+58
|\ \ \ | | | | | | | | | | | | | | | | Adding qa-selectors for e2e tests See merge request gitlab-org/gitlab-ce!21824
| * | | Adding qa-selectors for e2e testsRamya Authappan2018-10-058-9/+58
|/ / /
* | | Merge branch 'patch-29' into 'master'Marcia Ramos2018-10-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Documentation: Use proper Configure label instead of Configuration in issue_workflow.md See merge request gitlab-org/gitlab-ce!22114
| * | | Use proper Configure label instead of Configuration in issue_workflow.mdZsolt Kovari2018-10-041-1/+1
| | | |
* | | | Merge branch '52143-use-tiller-directly' into 'master'Dmitriy Zaporozhets2018-10-051-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tiller directly for Auto DevOps Closes #52143 See merge request gitlab-org/gitlab-ce!22076
| * | | | Redirect IO streams to prevent hangingThong Kuah2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://en.wikipedia.org/wiki/Nohup#Overcoming_hanging https://gitlab.com/gitlab-org/gitlab-runner/issues/2880
| * | | | Use tiller directly for Auto DevOpsThong Kuah2018-10-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This saves a external network call to fetch a helm plugin. The cost is a few lines of shell script
* | | | | Merge branch 'revert-2f0a0761' into 'master'Douwe Maan2018-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'" See merge request gitlab-org/gitlab-ce!22134
| * | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'"James Lopez2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | This reverts merge request !21520
* | | | | | Merge branch 'features/unauth-access-ssh-keys' into 'master'Douwe Maan2018-10-054-29/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | List public ssh keys by id or username without authentication See merge request gitlab-org/gitlab-ce!20118
| * | | | | | List public ssh keys by id or username without authenticationRonald Claveau2018-10-034-29/+22
| | | | | | |
* | | | | | | Merge branch 'rs-feature-enabled-and-licensed' into 'master'Douwe Maan2018-10-052-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Feature.enabled_and_licensed?` See merge request gitlab-org/gitlab-ce!21687
| * | | | | | | Add ProjectFeature check for feature flagRobert Speicher2018-10-042-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow an explicitly-disabled feature flag to override a feature being available for a project. As an extreme example, we could quickly disable issues across all projects at runtime by running `Feature.disable(:issues)`.
* | | | | | | | Merge branch '51748-filter-any-milestone-via-api' into 'master'Douwe Maan2018-10-056-1/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to filter issues by `Any milestone` in the API Closes #51748 See merge request gitlab-org/gitlab-ce!22080
| * | | | | | | | Allows to filter issues by `Any milestone` in the APIJacopo2018-10-036-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GET `api/v4/projects/:id/issues` the user can filter issues that have an assigned milestone through the parameter `milestone=Any+Milestone`.
* | | | | | | | | Merge branch 'mao/48221-issues_show_sql_count' into 'master'Sean McGivern2018-10-057-10/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banzai label ref finder - minimize SQL calls by sharing context more aggresively Closes #48221 See merge request gitlab-org/gitlab-ce!22070
| * | | | | | | | Banzai project ref- share context more aggresivelyMario de la Ossa2018-10-047-10/+34
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes `Banzai::CrossProjectReference#parent_from_ref` to return the project in the context if the project's `full_path` matches the ref we're looking for, as it makes no sense to go to the database to find a Project we already have loaded.
* | | | | | | | Merge branch 'spec-helpers-order' into 'master'Stan Hu2018-10-051-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Require spec helpers loaded by other spec helpers first See merge request gitlab-org/gitlab-ce!22127
| * | | | | | | Require spec helpers loaded by other spec helpers firstAlejandro Rodríguez2018-10-041-0/+5
|/ / / / / / /
* | | | | | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-041-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE backport: Add css class to Admin > Project > show page See merge request gitlab-org/gitlab-ce!22124
| * | | | | | | Add css class to Admin > Project > show pageGabriel Mazetto2018-10-041-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '40140-2FA-mobile-options-should-be-rephrased' into 'master'Filipa Lacerda2018-10-045-14/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "2FA mobile options should be rephrased" Closes #40140 See merge request gitlab-org/gitlab-ce!21998
| * | | | | | | Resolve "2FA mobile options should be rephrased"Marc Schwede2018-10-045-14/+19
|/ / / / / / /
* | | | | | | Merge branch '52194-trim-extra-whitespace-invite-member' into 'master'Clement Ho2018-10-042-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim whitespace when inviting a new user by email Closes #52194 See merge request gitlab-org/gitlab-ce!22119
| * | | | | | | Trim whitespace when inviting a new user by emailJacopo2018-10-042-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'sh-bump-gitaly-to-fix-mirrors' into 'master'Alejandro Rodríguez2018-10-041-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly to v0.124.0 Closes #52235 See merge request gitlab-org/gitlab-ce!22120
| * | | | | | | Bump Gitaly to v0.124.0Stan Hu2018-10-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/52235
* | | | | | | Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-045-3/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
| * | | | | | | Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-035-3/+19
| | | | | | | |
* | | | | | | | Merge branch '47496-more-n-1s-in-calculating-notification-recipients' into ↵Robert Speicher2018-10-044-16/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "More N+1s in calculating notification recipients" Closes #47496 See merge request gitlab-org/gitlab-ce!22050
| * | | | | | | | Add changelog entrySean McGivern2018-10-041-0/+5
| | | | | | | | |
| * | | | | | | | Fix N+1 for notification recipients on private projectsSean McGivern2018-10-042-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't call #to_a, we're relying on the members already being loaded from elsewhere. Otherwise we'll do a separate query for each user: [1] pry(main)> Project.first.team.members.include?(User.first) Project Load (0.7ms) SELECT "projects".* FROM "projects" ORDER BY "projects"."id" ASC LIMIT 1 ↳ (pry):3 User Load (1.8ms) SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1 ↳ (pry):3 User Exists (0.6ms) SELECT 1 AS one FROM "users" INNER JOIN "project_authorizations" ON "users"."id" = "project_authorizations"."user_id" WHERE "project_authorizations"."project_id" = $1 AND "users"."id" = $2 LIMIT 1 [["project_id", 1], ["id", 1]] ↳ (pry):3 => true [2] pry(main)> Project.first.team.members.to_a.include?(User.first) Project Load (12.8ms) SELECT "projects".* FROM "projects" ORDER BY "projects"."id" ASC LIMIT 1 ↳ (pry):1 User Load (9.6ms) SELECT "users".* FROM "users" INNER JOIN "project_authorizations" ON "users"."id" = "project_authorizations"."user_id" WHERE "project_authorizations"."project_id" = $1 [["project_id", 1]] ↳ (pry):1 User Load (0.6ms) SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1 ↳ (pry):1 => true
| * | | | | | | | Fix N+1 for notification recipients in subscribersSean McGivern2018-10-042-15/+40
| | | | | | | | |
* | | | | | | | | Merge branch 'new-docs-linting-image' into 'master'Achilleas Pipinellis2018-10-041-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change image for docs linting See merge request gitlab-org/gitlab-ce!22100
| * | | | | | | | | Change image for docs lintingEvan Read2018-10-041-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch '50552-unable-to-close-performance-bar' into 'master'Annabel Dunstone Gray2018-10-043-1/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Unable to close performance bar" Closes #50552 See merge request gitlab-org/gitlab-ce!21577
| * | | | | | | | | | Make perfbar z-index above modal background50552-unable-to-close-performance-barSimon Knox2018-10-043-1/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '52178-markdown-table-borders' into 'master'Phil Hughes2018-10-042-3/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown table border and background color Closes #52178 See merge request gitlab-org/gitlab-ce!22090
| * | | | | | | | | | Fix markdown table border and background colorAnnabel Dunstone Gray2018-10-042-3/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-pipeline-in-mr-docs' into 'master'Achilleas Pipinellis2018-10-041-209/+473
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the MR documentation See merge request gitlab-org/gitlab-ce!22086
| * | | | | | | | | | Improve the MR documentationRémy Coutable2018-10-041-209/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '48222-fix-todos-status-button' into 'master'Phil Hughes2018-10-042-3/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error while updating todo status: the button is stuck in the loading state" Closes #48222 See merge request gitlab-org/gitlab-ce!20994
| * | | | | | | | | | | Resolve "Error while updating todo status: the button is stuck in the ↵Marcos Barrera2018-10-042-3/+15
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading state"
View Lorry Controller Status