summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changed specfj-42112-fix-deploy-keys-migration-mysql-10-2Francisco Javier López2018-01-171-2/+2
* Changed specFrancisco Javier López2018-01-171-3/+15
* Added migration specFrancisco Javier López2018-01-173-14/+45
* Fixed migrationsFrancisco Javier López2018-01-172-44/+78
* Fixing migrationFrancisco Javier López2018-01-172-32/+38
* Update VERSION to 10.2.6v10.2.6Oswaldo Ferreira2018-01-111-1/+1
* Update CHANGELOG.md for 10.2.6Oswaldo Ferreira2018-01-1110-46/+15
* Merge branch '10-2-stable-patch-6' into '10-2-stable'Oswaldo Ferreira2018-01-1095-278/+1236
|\
| * Merge branch 'jej/fix-disabled-oauth-access' into 'security-10-2'Robert Speicher2018-01-098-13/+118
| * Merge branch 'ipython-xss-fix' into 'security-10-2'Jacob Schatz2018-01-098-4/+190
| * Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-085-1/+28
| * Merge branch 'fix/import-rce-10-2' into 'security-10-2'James Lopez2018-01-085-16/+68
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-2' into 'securit...Douwe Maan2018-01-0833-142/+383
| * Merge branch '41567-projectfix-10-2' into 'security-10-2'Sean McGivern2018-01-088-20/+133
| * Merge branch 'security-ac/fix-path-traversal-10-2' into 'security-10-2'Robert Speicher2018-01-084-2/+83
| * Merge branch 'sh-validate-path-project-import-10-2' into 'security-10-2'Robert Speicher2018-01-084-2/+71
| * Merge branch 'milestones-finder-order-fix-10-2' into 'security-10-2'Robert Speicher2018-01-087-54/+43
| * Merge branch 'label-xss-security' into 'security-10-2'Jacob Schatz2018-01-082-1/+10
| * Merge branch 'ac/41346-xss-ci-job-output-backport-10-2' into 'security-10-2'Robert Speicher2018-01-083-5/+57
| * Merge branch 'security-10-2-do-not-expose-passwords-or-tokens-in-service-inte...Sean McGivern2018-01-089-18/+52
|/
* Update VERSION to 10.2.5v10.2.5Michael Kozono2017-12-151-1/+1
* Update CHANGELOG.md for 10.2.5Michael Kozono2017-12-1512-56/+20
* Merge branch '10-2-stable-patch-5' into '10-2-stable'Michael Kozono2017-12-1569-325/+722
|\
| * Merge branch 'sh-optimize-groups-api-10-2' into '10-2-stable-patch-5'10-2-stable-patch-5Winnie Hellmann2017-12-1418-60/+292
| |\
| | * Solved copy/paste error!Francisco Javier López2017-12-141-4/+5
| | * Resolving conflictsh-optimize-groups-api-10-2Francisco Javier López2017-12-141-23/+5
| | * Resolving conflictFrancisco Javier López2017-12-141-5/+6
| | * Resolving conflictFrancisco Javier López2017-12-141-4/+1
| | * Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-1418-32/+271
| | * Cherry pick lib/api/entities.rb from 763ea26dc6be7760e4084b57bcf56f32e3e9ef0aKamil Trzciński2017-12-141-7/+19
| * | Merge branch 'bvl-fork-networks-for-deleted-projects-10-2' into '10-2-stable-...Winnie Hellmann2017-12-145-7/+111
| |\ \
| | * | Resolve conflicts in `populate_fork_networks_range.rb`Bob Van Landuyt2017-12-141-3/+0
| | * | Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'Sean McGivern2017-12-145-7/+114
| * | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version-10-2' i...Winnie Hellmann2017-12-143-13/+5
| |\ \ \ | | |/ / | |/| |
| | * | Resolve conflict in config/initializers/7_prometheus_metrics.rbWinnie Hellmann2017-12-141-12/+0
| | * | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-143-4/+8
| |/ /
| * | Merge branch 'winh-upgrade-codeclimate' into 'master'Rémy Coutable2017-12-141-1/+1
| |/
| * Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-142-6/+4
| * Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into...Tim Zallmann2017-12-142-3/+8
| * Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-145-0/+32
| * Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2017-12-142-15/+15
| * Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-141-0/+10
| * Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-host...Jacob Schatz2017-12-142-2/+8
| * Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master'Clement Ho2017-12-142-25/+7
| * Merge branch '40592-dropdown-options-are-misaligned' into 'master'Clement Ho2017-12-141-0/+1
| * Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-148-72/+61
| * Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-12-144-17/+48
| * Merge branch '40543-generalize-detail-page-headers' into 'master'Phil Hughes2017-12-149-79/+66
| * Merge branch 'protected-branches-names' into 'master'Douwe Maan2017-12-143-2/+11
| * Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-146-23/+42
|/
View Lorry Controller Status