summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add rake task to check db schema is validdz-check-schemaDmitriy Zaporozhets2017-09-192-0/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'role-badge-fix' into 'master'Douwe Maan2017-09-181-1/+1
|\ | | | | | | | | IssueNotes: Fix role badge styling. See merge request gitlab-org/gitlab-ce!14279
| * IssueNotes: Fix role badge styling.role-badge-fixFatih Acet2017-09-141-1/+1
| |
* | Merge branch '37857-build-header-gap' into 'master'Phil Hughes2017-09-182-7/+7
|\ \ | | | | | | | | | | | | | | | | | | Remove gaps under nav on build page Closes #37857 See merge request gitlab-org/gitlab-ce!14283
| * | Remove gaps under nav on build pageAnnabel Dunstone Gray2017-09-182-7/+7
|/ /
* | Merge branch 'docs-replace-pipelines-cicd' into 'master'Achilleas Pipinellis2017-09-186-17/+17
|\ \ | | | | | | | | | | | | Change Pipelines to CI/CD for Settings page See merge request gitlab-org/gitlab-ce!14168
| * \ Merge branch 'master' into 'docs-replace-pipelines-cicd'Achilleas Pipinellis2017-09-18384-4667/+7147
| |\ \ | |/ / |/| | | | | # Conflicts: # doc/ci/variables/README.md
* | | Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'Robert Speicher2017-09-171-2/+29
| | | | | | | | | | | | | | | | | | | | | Add Security Concerns section to reply by email documentation [ci skip] See merge request gitlab/gitlabhq!2191
* | | Merge branch 'fix-sidebar-with-scrollbars' into 'master'Annabel Dunstone Gray2017-09-164-9/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed the new sidebars width when browser has scrollbars Closes #37606 See merge request gitlab-org/gitlab-ce!14191
| * | | Fixed the new sidebars width when browser has scrollbarsPhil Hughes2017-09-164-9/+23
|/ / /
* | | Merge branch 'issue_37640' into 'master'Grzegorz Bizon2017-09-166-6/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix project feature being deleted when updating project with invalid visibility level Closes #37640 See merge request gitlab-org/gitlab-ce!14234
| * \ \ Merge branch 'master' into 'issue_37640'issue_37640Felipe Artur2017-09-15310-3656/+5781
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Add data migrationFelipe Artur2017-09-153-2/+35
| | | | |
| * | | | Fix project feature being deleted when updating project with invalid ↵Felipe Artur2017-09-125-5/+33
| | | | | | | | | | | | | | | | | | | | visibility level
* | | | | Merge branch 'rs-default-user-entity' into 'master'Stan Hu2017-09-161-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Ensure we use `Entities::User` for non-admin `users/:id` API requests See merge request gitlab-org/gitlab-ce!14314
| * | | | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
|/ / / /
* | | | Merge branch 'grpc-1.6' into 'master'Robert Speicher2017-09-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use grpc 1.6.0 See merge request gitlab-org/gitlab-ce!14262
| * | | | Use grpc 1.6.0grpc-1.6Jacob Vosmaer2017-09-141-1/+1
| | | | |
* | | | | Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-154-4/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
| * | | | | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-154-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit running Namespace#force_share_with_group_lock_on_descendants would result in updating _all_ namespaces in the namespaces table, not just the descendants. This is the result of ActiveRecord::Relation#update_all not taking into account the CTE. To work around this we use the CTE query as a sub-query instead of directly calling #update_all. To prevent this from happening the relations returned by Gitlab::GroupHierarchy are now marked as read-only, resulting in an error being raised when methods such as #update_all are used. Fortunately on GitLab.com our statement timeouts appear to have prevented this query from actually doing any damage other than causing a very large amount of dead tuples. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916
* | | | | | Merge branch '35917_create_services_for_keys' into 'master'Rémy Coutable2017-09-1518-49/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | created services for keys See merge request gitlab-org/gitlab-ce!13331
| * | | | | | created services for keyshaseeb2017-09-1518-49/+103
|/ / / / / /
* | | | | | Merge branch '21331-improve-confusing-compare-page' into 'master'Phil Hughes2017-09-155-17/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the labels in the Compare form less confusing Closes #21331 See merge request gitlab-org/gitlab-ce!14225
| * | | | | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-155-17/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve the descriptive text * Rename "from" to "Target" and "to" to "Source" * Swap "Target" and "Source" to have the same order as in MRs * Reworded "Switch base of comparison" to "Swap versions" Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-157-16/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL performance improvements for ProjectsController#show See merge request gitlab-org/gitlab-ce!14226
| * | | | | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-144-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a pipeline is present for the last commit on a project's homepage we only run 1 query to get the builds, instead of running 2 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073339 for more information.
| * | | | | | Memoize pipelines for project download buttonsYorick Peterse2017-09-144-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Project#latest_successful_pipeline_for and Project#latest_successful_pipeline_for_default_branch. The 2nd method memoizes the result (taking nil values into account) to ensure the underlying query isn't executed multiple times when viewing a project's homepage. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073607 for more information.
* | | | | | | Merge branch 'winh-protected-branch-modal-merged' into 'master'36436-repo-button-back-button-not-consistentPhil Hughes2017-09-154-5/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display whether branch has been merged when deleting protected branch Closes #32295 See merge request gitlab-org/gitlab-ce!14220
| * | | | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-154-5/+20
|/ / / / / /
* | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-157-48/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| * | | | | | fixed merge request specrevert-sidebar-title-attributePhil Hughes2017-09-131-1/+1
| | | | | | |
| * | | | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-136-47/+38
| | | | | | |
* | | | | | | Merge branch 'docs/environment-vars-clarify' into 'master'Rémy Coutable2017-09-153-57/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify what variables can be used under `environment:` See merge request gitlab-org/gitlab-ce!14277
| * | | | | | | Clarify what variables can be used under `environment:`docs/environment-vars-clarifyAchilleas Pipinellis2017-09-143-57/+69
| | | | | | | |
* | | | | | | | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-157-2/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
| * | | | | | | | Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-listRémy Coutable2017-09-146-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Scope users by group in issuable search barbarthc2017-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '37844-layout-nav-space' into 'master'Phil Hughes2017-09-151-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra space between profile header and navbar Closes #37844 See merge request gitlab-org/gitlab-ce!14275
| * | | | | | | | | Remove extra space between profile header and navbar37844-layout-nav-spaceAnnabel Dunstone Gray2017-09-141-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '37886-typo-in-protected-runners-setting-checkbox' into 'master'Grzegorz Bizon2017-09-151-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Typo in Protected Runners setting checkbox" Closes #37886 See merge request gitlab-org/gitlab-ce!14284
| * | | | | | | | | Fix typo37886-typo-in-protected-runners-setting-checkboxFabio Busatto2017-09-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-26' into 'master'Stan Hu2017-09-151-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add info about UX label to feature proposal to CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!14281
| * | | | | | | | | | add info about UX label to feature proposal to CONTRIBUTING.mdSarrah Vesselov2017-09-141-1/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '37896-minor-improvements-to-prometheus-docs' into 'master'Achilleas Pipinellis2017-09-152-3/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor improvements to prometheus docs Closes #37896 See merge request gitlab-org/gitlab-ce!14288
| * | | | | | | | | | update screenshot37896-minor-improvements-to-prometheus-docsJoshua Lambert2017-09-151-0/+0
| | | | | | | | | | |
| * | | | | | | | | | fix minor typoJoshua Lambert2017-09-151-3/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'indexes-for-recent-push-events' into 'master'Robert Speicher2017-09-142-2/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing index for getting recent push events See merge request gitlab-org/gitlab-ce!14273
| * | | | | | | | | | Add missing index for getting recent push eventsindexes-for-recent-push-eventsYorick Peterse2017-09-142-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This index is required to allow fast retrieval of recent push events without merge requests. Without this index in place the query would lead to PostgreSQL scanning over 150 000 index entries all the time, easily taking up between 200 and 500 milliseconds. This index reduces the time spent in this process to around 40 milliseconds on GitLab.com.
* | | | | | | | | | | Merge branch 'changes-overflow-fix' into 'master'Annabel Dunstone Gray2017-09-142-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overflow issue in changes dropdown See merge request gitlab-org/gitlab-ce!14181
| * | | | | | | | | | Fixed overflow issue in changes dropdownchanges-overflow-fixPhil Hughes2017-09-132-3/+11
| | |_|_|/ / / / / / | |/| | | | | | | |
View Lorry Controller Status