summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-158-78/+76
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix-dev-ssl' into 'master'Grzegorz Bizon2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never connect to webpack-dev-server over SSL in dev mode See merge request gitlab-org/gitlab-ce!14297
| * | | | | | | | | | | | | | | | Never connect to webpack-dev-server over SSLfix-dev-sslAlessio Caiazza2017-09-151-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-184-40/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
| * | | | | | | | | | | | | | | | add Mayra Cabrera to authors of changeMaxim Rydkin2017-09-101-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-103-28/+58
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-103-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix rubocopMaxim Rydkin2017-09-101-8/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | adds changelogMaxim Rydkin2017-09-101-0/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | finish spec/finders/yet_another_users_finder_spec.rbMaxim Rydkin2017-09-101-54/+42
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | extract finder and add first testMaxim Rydkin2017-09-103-22/+129
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-184-73/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325
| * | | | | | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-184-73/+61
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-184-66/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322
| * | | | | | | | | | | | | | | | | Replace the 'project/archived.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-174-66/+48
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update-test-images' into 'master'Tim Zallmann2017-09-183-38/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build images See merge request gitlab-org/gitlab-ce!14315
| * | | | | | | | | | | | | | | | | dedupe yarn packagesupdate-test-imagesMike Greiling2017-09-161-36/+126
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add dependency approvals (all MIT license)Mike Greiling2017-09-161-0/+36
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | update build image to latest with node 8.x, yarn 1.0.2, and chrome 61Mike Greiling2017-09-161-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'improve_spec_features_profiles_specs' into 'master'Rémy Coutable2017-09-188-38/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve 'spec/features/profiles/*' specs Closes #37855 et #37856 See merge request gitlab-org/gitlab-ce!14317
| * | | | | | | | | | | | | | | | | | Improve 'spec/features/profiles/*' specsVitaliy @blackst0ne Klachkov2017-09-168-38/+39
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'replace_search.feature' into 'master'Rémy Coutable2017-09-1815-526/+564
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'search.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14248
| * | | | | | | | | | | | | | | | | | Replace the 'search.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-1615-526/+564
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-186-0/+386
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783
| * | | | | | | | | | | | | | | | | | Reduce batch sizemk-delete-conflicting-redirects-mysqlMichael Kozono2017-09-142-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | …to stay within our query timeout of 60s. Also reduce the job interval to keep the same overall migration time of ~3.3 days.
| * | | | | | | | | | | | | | | | | | Spread out the work a littleMichael Kozono2017-09-144-10/+117
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Extract helper for queuing background jobsMichael Kozono2017-09-144-34/+113
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Simplify queryMichael Kozono2017-09-141-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance does not need to be optimized in this case because this will be run in batches at a controlled rate.
| * | | | | | | | | | | | | | | | | | Add specs for deleting conflicting redirectsMichael Kozono2017-09-144-3/+94
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Delete conflicting redirects in backgroundMichael Kozono2017-09-142-0/+118
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | 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