summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't reset the session when the example failed, because we need capybara-scr...dm-restore-capybara-screenshotDouwe Maan2017-06-211-2/+3
* Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master'Robert Speicher2017-06-227-6/+80
|\
| * Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-217-6/+80
* | Merge branch 'system-note-commits-list-gradient-fix' into 'master'Annabel Dunstone Gray2017-06-212-1/+5
|\ \
| * | Fixed commit list system not gradientsystem-note-commits-list-gradient-fixPhil Hughes2017-06-202-1/+5
* | | Wording of Mysql support.sytses2017-06-211-3/+3
* | | Merge branch 'docs/exclude-codeclimate' into 'master'Rémy Coutable2017-06-211-0/+1
|\ \ \
| * | | Do not run the codeclimate job on docs-only changesAchilleas Pipinellis2017-06-211-0/+1
* | | | Merge branch 'docs/add-missing-link' into 'master'Robert Speicher2017-06-211-0/+1
|\ \ \ \
| * | | | Add missing link in Redis HA source docsdocs/add-missing-linkAchilleas Pipinellis2017-06-211-0/+1
* | | | | Merge branch 'feature-checklist' into 'master'Marcia Ramos2017-06-211-6/+18
|\ \ \ \ \
| * | | | | a new feature checklist and more elaborate documentation requirementsJob van der Voort2017-06-211-6/+18
|/ / / / /
* | | | | Merge branch 'backport-filtered-search-lazy-token-transient' into 'master'Clement Ho2017-06-211-0/+3
|\ \ \ \ \
| * | | | | Backport filtered search lazy token consistent state fixEric Eastwood2017-06-211-0/+3
* | | | | | Merge branch '33441_supplement_simplified_chinese_translation_of_i18n' into '...Douwe Maan2017-06-213-60/+842
|\ \ \ \ \ \
| * | | | | | Change 'Committed by' Translate黄涛2017-06-202-2/+2
| * | | | | | Translation optimization黄涛2017-06-202-30/+27
| |\ \ \ \ \ \
| | * | | | | | add missing translation fields黄涛2017-06-162-20/+32
| | * | | | | | translation optimization in synchronous reviews黄涛2017-06-152-25/+25
| | * | | | | | translation optimization in synchronous reviews黄涛2017-06-142-59/+59
| | * | | | | | Rebase to master黄涛2017-06-130-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | | * | | | | | Optimization 'zh_CN' translation黄涛2017-06-133-11/+755
| | | * | | | | | optimize translation based on comments黄涛2017-06-123-614/+74
| | | * | | | | | add changelog of supplement simplified chinese translation黄涛2017-06-081-0/+4
| | | * | | | | | supplement simplified chinese translation黄涛2017-06-083-21/+656
| | * | | | | | | Optimization 'zh_CN' translation黄涛2017-06-133-29/+28
| | * | | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | * | | | | | | Optimization 'zh_CN' translation黄涛2017-06-133-11/+755
| | * | | | | | | optimize translation based on comments黄涛2017-06-133-614/+74
| | * | | | | | | add changelog of supplement simplified chinese translation黄涛2017-06-131-0/+4
| | * | | | | | | supplement simplified chinese translation黄涛2017-06-133-83/+652
| * | | | | | | | supplement simplified chinese translation黄涛2017-06-203-56/+841
* | | | | | | | | Merge branch 'fix-33259' into 'master'Sean McGivern2017-06-214-35/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a comment explaining how the branch clean up happensDouglas Barbosa Alexandre2017-06-211-0/+6
| * | | | | | | | | Fix Github::Representation::PullRequest#source_branch_exists?Douglas Barbosa Alexandre2017-06-211-1/+1
| * | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-06-211-0/+4
| * | | | | | | | | Fix GitHub importer performance on branch existence checkDouglas Barbosa Alexandre2017-06-213-35/+57
* | | | | | | | | | Merge branch 'fix/gb/improve-build-stage-reference-migration' into 'master'Kamil Trzciński2017-06-217-25/+77
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename stage ref migration specs to match a class namefix/gb/improve-build-stage-reference-migrationGrzegorz Bizon2017-06-211-0/+0
| * | | | | | | | | | Update build stage reference migration specsGrzegorz Bizon2017-06-211-2/+2
| * | | | | | | | | | Merge branch 'master' into 'fix/gb/improve-build-stage-reference-migration'Grzegorz Bizon2017-06-2110-5/+64
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump build stage id reference migration identifierGrzegorz Bizon2017-06-212-15/+34
| * | | | | | | | | | | Fix adding/removing foreign keys on MySQLGrzegorz Bizon2017-06-213-4/+3
| * | | | | | | | | | | Fix build stages reference migrationGrzegorz Bizon2017-06-215-5/+39
* | | | | | | | | | | | Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-06-213-9/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-213-9/+18
* | | | | | | | | | | | | Merge branch 'backport-check-project-feature' into 'master'Douwe Maan2017-06-217-32/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-217-32/+13
| * | | | | | | | | | | | Backport check_project_feature_available! from EENick Thomas2017-06-211-1/+8
| | |/ / / / / / / / / / | |/| | | | | | | | | |