summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'dispatcher-project-mr-edit'dispatcher-project-mr-editClement Ho2018-01-17450-2797/+6039
|\
| * 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
| |/ /
| * | Merge branch '42006-allow-toggling-of-performance-bar-in-development' into 'm...Sean McGivern2018-01-174-10/+34
| |\ \
| | * | In development, allow the toggling of the performance barRémy Coutable2018-01-174-10/+34
| * | | Merge branch 'revert-c8ddf067' into 'master'Tim Zallmann2018-01-172-36/+0
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Merge branch 'pre-commit-prettier' into 'master'"revert-c8ddf067Filipa Lacerda2018-01-044-41/+0
| * | | Merge branch 'add-fast-blank' into 'master'Sean McGivern2018-01-173-0/+10
| |\ \ \
| | * | | Use the fast_blank gemadd-fast-blankdosire2018-01-163-0/+10
| * | | | Merge branch 'qa-add-deploy-key-view-elements' into 'master'Grzegorz Bizon2018-01-173-15/+19
| |\ \ \ \
| | * | | | Try to match more aggressivelyqa-add-deploy-key-view-elementsLin Jen-Shin2018-01-161-2/+3
| | * | | | Add view elements to deploy keys pagesLin Jen-Shin2018-01-153-15/+18
| * | | | | Merge branch '42035-projects-dropdown-scroll' into 'master'Tim Zallmann2018-01-172-1/+3
| |\ \ \ \ \
| | * | | | | Restore custom height for projects dropdown42035-projects-dropdown-scrollAnnabel Dunstone Gray2018-01-162-1/+3
| | | |/ / / | | |/| | |
| * | | | | Merge branch '41118-add-sorting-to-deployments-api' into 'master'Rémy Coutable2018-01-174-6/+59
| |\ \ \ \ \
| | * | | | | Adds sorting to deployments APIJacopo2018-01-174-6/+59
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' int...Filipa Lacerda2018-01-172-0/+7
| |\ \ \ \ \
| | * | | | | Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-pageEric Eastwood2018-01-162-0/+7
| | |/ / / /
| * | | | | Merge branch 'remove-branch-names-contains' into 'master'Sean McGivern2018-01-172-39/+0
| |\ \ \ \ \
| | * | | | | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-172-39/+0
| |/ / / / /
| * | | | | Merge branch 'merge-request-target-branch-perf' into 'master'Filipa Lacerda2018-01-176-9/+57
| |\ \ \ \ \
| | * | | | | fixed missing commamerge-request-target-branch-perfPhil Hughes2018-01-161-1/+1
| | * | | | | actual spec fixesPhil Hughes2018-01-161-0/+1
| | * | | | | more spec fixesPhil Hughes2018-01-162-2/+0
| | * | | | | fixed failing specPhil Hughes2018-01-161-0/+1
| | * | | | | only search branchesPhil Hughes2018-01-163-21/+13
| | * | | | | Improved performance of merge requests target branch dropdownPhil Hughes2018-01-164-5/+61
| * | | | | | Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-173-0/+25
| |\ \ \ \ \ \
| | * | | | | | Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-173-0/+25
View Lorry Controller Status