summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-mermaid-import' into 'master'Filipa Lacerda2017-11-235-58/+50
|\ | | | | | | | | Fixed import of render mermaid & render math methods See merge request gitlab-org/gitlab-ce!15550
| * moved to es6 modulesfix-mermaid-importPhil Hughes2017-11-224-50/+45
| |
| * Fixed import of render mermaid & render math methodsPhil Hughes2017-11-222-12/+9
| |
* | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'Rémy Coutable2017-11-233-6/+6
|\ \ | | | | | | | | | | | | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService See merge request gitlab-org/gitlab-ce!15575
| * | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-serviceJames Edwards-Jones2017-11-233-6/+6
| | |
* | | Merge branch 'simplify-db-changes-template' into 'master'Rémy Coutable2017-11-231-37/+9
|\ \ \ | | | | | | | | | | | | | | | | Simplify the DB changes checklist See merge request gitlab-org/gitlab-ce!15577
| * | | Simplify the DB changes checklistsimplify-db-changes-templateYorick Peterse2017-11-231-37/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes some somewhat redundant checkboxes from the template and rephrases the introduction now that those settings are in GDK. [ci skip]
* | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-237-32/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464
| * | | | Make sure we're using git installed in gitlab-build-images39887-move-identical-check-to-merged-branchesLin Jen-Shin2017-11-231-0/+1
| | | | |
| * | | | Make sure repository is restoredLin Jen-Shin2017-11-231-0/+4
| | | | |
| * | | | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-236-32/+27
| | | | |
* | | | | Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable2017-11-2313-0/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added Rubocop config for background migrations See merge request gitlab-org/gitlab-ce!15576
| * | | | | Added Rubocop config for background migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-2315-8/+197
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
| * | | | | Use latest_merge_request_diff associationSean McGivern2017-11-2315-8/+197
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2315-36/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
| * | | | | Fix link text from group contextJarka Kadlecova2017-11-2315-36/+51
| | | | | |
* | | | | | Merge branch 'feature/disable-password-authentication' into 'master'Douwe Maan2017-11-2352-110/+299
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow password authentication to be disabled entirely Closes #37320 See merge request gitlab-org/gitlab-ce!15223
| * | | | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-2352-110/+299
|/ / / / / /
* | | | | | Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński2017-11-231-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures See merge request gitlab-org/gitlab-ce!15566
| * | | | | | Remove cluster_id from ↵Shinya Maeda2017-11-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures
* | | | | | | Merge branch 'docs/cross-link-default-branch' into 'master'Marcia Ramos2017-11-231-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross link default branch docs to issue closing pattern docs Closes #40449 See merge request gitlab-org/gitlab-ce!15546
| * | | | | | | Cross link default branch docs to issue closing pattern docsdocs/cross-link-default-branchAchilleas Pipinellis2017-11-221-2/+3
| | | | | | | |
* | | | | | | | Merge branch 'docs/redirect-fix' into 'master'Marcia Ramos2017-11-239-13/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the redirect location wording Closes gitlab-com/gitlab-docs#142 See merge request gitlab-org/gitlab-ce!15572
| * | | | | | | | Fix the redirect location wordingAchilleas Pipinellis2017-11-239-13/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-com/gitlab-docs/issues/142
* | | | | | | | Merge branch 'tz-update-vue-libraries' into 'master'Phil Hughes2017-11-232-79/+70
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Updated all Vue libraries See merge request gitlab-org/gitlab-ce!15554
| * | | | | | | Updated all Vue librariestz-update-vue-librariesTim Zallmann2017-11-232-79/+70
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '32098-environments-reusable' into 'master'Phil Hughes2017-11-2332-804/+933
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve environments performance Closes #32098 See merge request gitlab-org/gitlab-ce!15484
| * | | | | | Improve environments performanceFilipa Lacerda2017-11-2332-804/+933
|/ / / / / /
* | | | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "EE Compatibility Check Job Fails Unexpectedly" Closes #40463 See merge request gitlab-org/gitlab-ce!15555
| * | | | | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
| | | | | | |
| * | | | | | Try to always find the merge base using `origin/#{branch}` instead of just ↵Rémy Coutable2017-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `#{branch}`
* | | | | | | Merge branch 'git-user-encoding' into 'master'Rémy Coutable2017-11-235-8/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding bugs in Gitlab::Git::User Closes #40330 See merge request gitlab-org/gitlab-ce!15539
| * | | | | | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-235-8/+32
|/ / / / / / /
* | | | | | | Merge branch ↵Kamil Trzciński2017-11-233-13/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | Add change logShinya Maeda2017-11-231-0/+6
| | | | | | | |
| * | | | | | | Fix testing orderShinya Maeda2017-11-231-1/+1
| | | | | | | |
| * | | | | | | Add a testShinya Maeda2017-11-231-12/+19
| | | | | | | |
| * | | | | | | Avoid deactivation when pipeline schedules execute a commit includes `[ci skip]`Shinya Maeda2017-11-231-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'feature/sm/40147-add-environment_scope-to-cluster-table' into ↵Kamil Trzciński2017-11-232-0/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add environment_scope to cluster table See merge request gitlab-org/gitlab-ce!15419
| * | | | | | Add environment_scope to cluster tableShinya Maeda2017-11-222-0/+16
| |/ / / / /
* | | | | | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵Filipa Lacerda2017-11-231-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534
| * | | | | | Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emailsAlessio Caiazza2017-11-221-0/+4
| |/ / / / /
* | | | | | Merge branch '40445-upgrade-fe-babel-libraries' into 'master'Filipa Lacerda2017-11-232-315/+490
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade FE Babel Libraries" Closes #40445 See merge request gitlab-org/gitlab-ce!15544
| * | | | | | Upgraded babel related libraries40445-upgrade-fe-babel-librariesTim Zallmann2017-11-222-315/+490
| | | | | | |
* | | | | | | Merge branch 'jivl-general-icons' into 'master'Tim Zallmann2017-11-234-10/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change star, filter and settings icons to the their sprite based replacements Closes #33757 See merge request gitlab-org/gitlab-ce!15412
| * | | | | | Change star, filter and settings icons to the their sprite based replacementsJose Ivan Vargas Lopez2017-11-234-10/+15
|/ / / / / /
* | | | | | Update CHANGELOG.md for 10.2.1Michael Kozono2017-11-222-5/+7
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-226-23/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
View Lorry Controller Status