summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-172-2/+3
* fixed markdown_spec.jsPhil Hughes2018-01-171-1/+1
* fixed conflictsPhil Hughes2018-01-172-44/+17
* Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rbStan Hu2018-01-163-11/+3
* Update VERSION to 10.3.4Oswaldo Ferreira2018-01-161-0/+4
* Update CHANGELOG.md for 10.3.4Oswaldo Ferreira2018-01-167-36/+0
* Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-168-13/+118
* Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-167-4/+188
* Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-165-16/+68
* Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-165-1/+28
* Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1633-139/+400
* Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-168-20/+133
* Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-164-2/+83
* Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-164-2/+71
* Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-167-54/+43
* Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-162-1/+10
* Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-162-5/+52
* Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-169-18/+52
* Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-163-2/+16
|\
| * Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-163-2/+16
* | Merge branch '37898-increase-readability-of-colored-text-in-job-output-log' i...Annabel Dunstone Gray2018-01-162-15/+19
|\ \
| * | fix readability xterm colorsDanny2018-01-162-15/+19
|/ /
* | Merge branch '42047-pg-10-support' into 'master'Nick Thomas2018-01-165-4/+66
|\ \
| * | Update seed-fu to a version compatible with postgresql 10Nick Thomas2018-01-163-3/+12
| * | Support PostgreSQL 10Nick Thomas2018-01-163-1/+54
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-161-2/+3
|\ \ \
| * | | Update test-and-deploy-ruby-application-to-heroku.mdJJ Asghar2018-01-161-2/+3
* | | | Merge branch '40818-last-push-widget-does-not-appear-after-pushing-new-commit...Rémy Coutable2018-01-165-6/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-155-6/+47
* | | | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \ \ \
| * | | | Add pipeline header paddingGeorge Tsiolis2018-01-162-0/+2
* | | | | Merge branch 'winh-style-modals' into 'master'Tim Zallmann2018-01-167-12/+42
|\ \ \ \ \
| * | | | | Adjust modal style to new designwinh-style-modalsWinnie Hellmann2018-01-117-12/+42
* | | | | | Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-164-4/+52
|\ \ \ \ \ \
| * | | | | | Use preload instead of includes to avoid joinsbuilds-api-nplusoneMatija Čupić2018-01-152-2/+2
| * | | | | | Add missing newline in Jobs API specMatija Čupić2018-01-151-0/+1
| * | | | | | Extend N+1 Builds and Jobs API specsMatija Čupić2018-01-152-2/+24
| * | | | | | Fix N+1 builds query in Jobs list APIMatija Čupić2018-01-141-0/+1
| * | | | | | Add N+1 query spec for Jobs APIMatija Čupić2018-01-141-2/+13
| * | | | | | Eager load user, runner, pipeline and its creatorMatija Čupić2018-01-141-1/+3
| * | | | | | Fix N+1 in v3 builds APIMatija Čupić2018-01-131-2/+1
| * | | | | | Add n plus one spec for v3 builds apiMatija Čupić2018-01-131-2/+14
* | | | | | | Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-163-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix links to uploaded files on wiki pagesNick Thomas2018-01-163-0/+17
* | | | | | | | Merge branch 'print-list-of-available-backups' into 'master'Douwe Maan2018-01-162-1/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Check for both backup filesprint-list-of-available-backupsBalasankar "Balu" C2018-01-161-1/+1
| * | | | | | | | Imitate other specsBalasankar "Balu" C2018-01-161-1/+1
| * | | | | | | | Try one expectation onlyBalasankar "Balu" C2018-01-161-2/+0
| * | | | | | | | Move conditional to a separate methodBalasankar "Balu" C2018-01-151-3/+5
| * | | | | | | | Run the code to be testedBalasankar "Balu" C2018-01-151-0/+1
View Lorry Controller Status