summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.md for 10.2.2Michael Kozono2017-11-2311-50/+22
* Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-234-2/+122
|\
| * Fix hashed storage for attachments bugsJames Lopez2017-11-234-2/+122
|/
* Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-239-118/+77
|\
| * Rename fetch_refs to refmapDouwe Maan2017-11-237-28/+29
| * Clean up repository fetch and mirror methodsDouwe Maan2017-11-239-115/+73
* | Merge branch 'fix-mermaid-import' into 'master'Filipa Lacerda2017-11-235-58/+50
|\ \
| * | 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 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 checklistsimplify-db-changes-templateYorick Peterse2017-11-231-37/+9
* | | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-237-32/+32
|\ \ \ \ \
| * | | | | 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 migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-2315-8/+197
|\ \ \ \ \ \
| * | | | | | Use latest_merge_request_diff associationSean McGivern2017-11-2315-8/+197
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2315-36/+51
|\ \ \ \ \ \
| * | | | | | 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 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_ar...Shinya Maeda2017-11-231-1/+0
* | | | | | | | Merge branch 'docs/cross-link-default-branch' into 'master'Marcia Ramos2017-11-231-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 wordingAchilleas Pipinellis2017-11-239-13/+11
| |/ / / / / / / /
* | | | | | | | | Merge branch 'tz-update-vue-libraries' into 'master'Phil Hughes2017-11-232-79/+70
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | 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 performanceFilipa Lacerda2017-11-2332-804/+933
|/ / / / / / /
* | | | | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| * | | | | | 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
* | | | | | | Merge branch 'git-user-encoding' into 'master'Rémy Coutable2017-11-235-8/+32
|\ \ \ \ \ \ \
| * | | | | | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-235-8/+32
|/ / / / / / /
* | | | | | | Merge branch 'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute...Kamil Trzciński2017-11-233-13/+26
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add environment_scope to cluster tableShinya Maeda2017-11-222-0/+16
| |/ / / / /
* | | | | | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' in...Filipa Lacerda2017-11-231-0/+4
|\ \ \ \ \ \
| * | | | | | Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emailsAlessio Caiazza2017-11-221-0/+4
| |/ / / / /
View Lorry Controller Status