Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-23Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan
Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464
2017-11-23Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable
Added Rubocop config for background migrations See merge request gitlab-org/gitlab-ce!15576
2017-11-23Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan
Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
2017-11-23Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern
Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
2017-11-23Clarify usage of Runner limit and AWS tagsAchilleas Pipinellis
2017-11-23Finish rest of the sectionsAchilleas Pipinellis
2017-11-23Finish all sections except docker.machineAchilleas Pipinellis
2017-11-23Add runners.cache sectionAchilleas Pipinellis
2017-11-23Add Runner registration infoAchilleas Pipinellis
2017-11-23Clear up sectionsAchilleas Pipinellis
2017-11-23Add skeletonAchilleas Pipinellis
2017-11-23Add article on autoscaling GitLab Runner on AWSAchilleas Pipinellis
2017-11-23Merge branch 'feature/disable-password-authentication' into 'master'Douwe Maan
Allow password authentication to be disabled entirely Closes #37320 See merge request gitlab-org/gitlab-ce!15223
2017-11-23Allow password authentication to be disabled entirelyMarkus Koller
2017-11-23Simplify the DB changes checklistYorick Peterse
This removes some somewhat redundant checkboxes from the template and rephrases the introduction now that those settings are in GDK. [ci skip]
2017-11-23Added Rubocop config for background migrationsYorick Peterse
This adds a Rubocop configuration file specific to lib/gitlab/background_migrations. This configuration will be used to (hopefully) make reviewing background migrations easier by enforcing stricter rules compared to the rest of GitLab. Because this configuration is directory specific it will only affect background migrations.
2017-11-23Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński
Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures See merge request gitlab-org/gitlab-ce!15566
2017-11-23Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServiceJames Edwards-Jones
2017-11-23Merge branch 'docs/cross-link-default-branch' into 'master'Marcia Ramos
Cross link default branch docs to issue closing pattern docs Closes #40449 See merge request gitlab-org/gitlab-ce!15546
2017-11-23Merge branch 'docs/redirect-fix' into 'master'Marcia Ramos
Fix the redirect location wording Closes gitlab-com/gitlab-docs#142 See merge request gitlab-org/gitlab-ce!15572
2017-11-23Use latest_merge_request_diff associationSean McGivern
Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
2017-11-23Merge branch 'tz-update-vue-libraries' into 'master'Phil Hughes
Updated all Vue libraries See merge request gitlab-org/gitlab-ce!15554
2017-11-23Merge branch '32098-environments-reusable' into 'master'Phil Hughes
Improve environments performance Closes #32098 See merge request gitlab-org/gitlab-ce!15484
2017-11-23Improve environments performanceFilipa Lacerda
2017-11-23Fix link text from group contextJarka Kadlecova
2017-11-23Upgrade jQuery to 2.2.4Takuya Noguchi
2017-11-23Fix the redirect location wordingAchilleas Pipinellis
Closes https://gitlab.com/gitlab-com/gitlab-docs/issues/142
2017-11-23Remove cluster_id from ↵Shinya Maeda
20171013104327_migrate_gcp_clusters_to_new_clusters_architectures
2017-11-23Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern
Resolve "EE Compatibility Check Job Fails Unexpectedly" Closes #40463 See merge request gitlab-org/gitlab-ce!15555
2017-11-23Merge branch 'git-user-encoding' into 'master'Rémy Coutable
Fix encoding bugs in Gitlab::Git::User Closes #40330 See merge request gitlab-org/gitlab-ce!15539
2017-11-23Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)
2017-11-23Merge branch ↵Kamil Trzciński
'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip' into 'master' Avoid deactivation when pipeline schedules execute a branch includes `[ci skip]` comment Closes #37991 See merge request gitlab-org/gitlab-ce!15405
2017-11-23Merge branch 'feature/sm/40147-add-environment_scope-to-cluster-table' into ↵Kamil Trzciński
'master' Add environment_scope to cluster table See merge request gitlab-org/gitlab-ce!15419
2017-11-23Make sure we're using git installed in gitlab-build-imagesLin Jen-Shin
2017-11-23Make sure repository is restoredLin Jen-Shin
2017-11-23Move identical merged branch check to merged_branch_namesLin Jen-Shin
2017-11-23Updated all Vue librariesTim Zallmann
2017-11-23Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵Filipa Lacerda
into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534
2017-11-23In EeCompatCheck, always reset to canonical-ee/master when applying a patchRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-23Merge branch '40445-upgrade-fe-babel-libraries' into 'master'Filipa Lacerda
Resolve "Upgrade FE Babel Libraries" Closes #40445 See merge request gitlab-org/gitlab-ce!15544
2017-11-23Merge branch 'jivl-general-icons' into 'master'Tim Zallmann
Change star, filter and settings icons to the their sprite based replacements Closes #33757 See merge request gitlab-org/gitlab-ce!15412
2017-11-23Change star, filter and settings icons to the their sprite based replacementsJose Ivan Vargas Lopez
2017-11-23Update prometheus-client-gem to 0.7.0.beta33Pawel Chojnacki
2017-11-23Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable
2017-11-23Try to always find the merge base using `origin/#{branch}` instead of just ↵Rémy Coutable
`#{branch}`
2017-11-23Update CHANGELOG.md for 10.2.1Michael Kozono
[ci skip]
2017-11-23Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable
Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
2017-11-22Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'Clement Ho
Add edit button to mobile file view Closes #28377 See merge request gitlab-org/gitlab-ce!15199
2017-11-22Upgraded babel related librariesTim Zallmann
2017-11-22Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas