summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix spec/migrations/update_upload_paths_to_system_spec.rb to use the :migrati...rc/fix-update_upload_paths_to_system_specRémy Coutable2018-01-181-26/+32
* Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-188-10/+160
|\
| * Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-188-10/+160
* | Merge branch 'jramsay-improved-convdev-image-docs' into 'master'Sean McGivern2018-01-181-0/+0
|\ \
| * | Update ConvDev Index docs w better screenshotjramsay-improved-convdev-image-docsJames Ramsay2018-01-171-0/+0
* | | Merge branch 'add-opensuse-to-supported-list' into 'master'Marin Jankovski2018-01-181-0/+1
|\ \ \
| * | | Add openSUSE to the supported Unix OS listBalasankar C2018-01-181-0/+1
|/ / /
* | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-01-181-1/+0
|\ \ \
| * | | Remove the second link, blog URL has changed hands and I can't find any new b...Connor Shea2018-01-171-1/+0
| |/ /
* | | Merge branch 'rc/port-from-ee-4119' into 'master'Sean McGivern2018-01-181-26/+39
|\ \ \
| * | | Add the :migration metadata, and don't use factories in FixWronglyRenamedRout...rc/port-from-ee-4119Rémy Coutable2018-01-171-26/+39
* | | | Merge branch '34252-trailing-plus' into 'master'Phil Hughes2018-01-184-1/+44
|\ \ \ \
| * | | | sentence-case changelog entry34252-trailing-plusSimon Knox2018-01-181-2/+2
| * | | | feature spec for #34252Simon Knox2018-01-181-0/+11
| * | | | consistent code styleSimon Knox2018-01-181-2/+1
| * | | | add test for search terms with +Simon Knox2018-01-181-2/+9
| * | | | fix board filter parsing - don't replace encoded + symbols with spacesSimon Knox2018-01-163-1/+27
* | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master'Annabel Dunstone Gray2018-01-182-41/+5
|\ \ \ \ \
| * | | | | Remove unused CSS selectors for Cycle AnalyticsTakuya Noguchi2018-01-072-41/+5
* | | | | | Merge branch 'file-content-large-screen-padding' into 'master'Annabel Dunstone Gray2018-01-172-0/+9
|\ \ \ \ \ \
| * | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-paddingtauriedavis2018-01-172-0/+9
* | | | | | | Merge branch 'winh-search-page-filters' into 'master'Clement Ho2018-01-174-0/+65
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-174-0/+65
|/ / / / / /
* | | | | | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-173-28/+111
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Applied fixFrancisco Javier López2018-01-173-28/+111
| |/ / / /
* | | | | Merge branch 'rs-buttons-partial' into 'master'Rémy Coutable2018-01-171-21/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partialRobert Speicher2018-01-161-21/+14
* | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1786-278/+1183
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 'feature/39591-visibility-level' into 'master'Clement Ho2018-01-172-1/+6
|\ \ \ \ \
| * | | | | Open visibility help in new tabJussi Räsänen2018-01-172-1/+6
|/ / / / /
* | | | | Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-177-13/+25
|\ \ \ \ \
| * | | | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-177-13/+25
|/ / / / /