summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc/fix-update_upload_paths_to_system_spec' into 'master'Sean McGivern2018-01-181-26/+32
|\
| * 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 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-188-13/+189
|\ \
| * | accept_confirm requires js driverAlexis Reigel2018-01-171-1/+1
| * | reference triggers.values for permitted parametersAlexis Reigel2018-01-172-3/+30
| * | add missing permitted paramAlexis Reigel2018-01-171-0/+1
| * | no need for a named parameterAlexis Reigel2018-01-171-1/+1
| * | accepts `.all` as a hook scope as wellAlexis Reigel2018-01-171-1/+9
| * | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-171-0/+18
| * | extract concern for hook triggersAlexis Reigel2018-01-171-0/+17
| * | api support for merge_requests_events system hookAlexis Reigel2018-01-041-1/+19
| * | we only need a test for the happy pathAlexis Reigel2018-01-041-8/+0
| * | use sentence case for "Merge request events"Alexis Reigel2018-01-041-1/+1
| * | merge requests on system hook admin pageAlexis Reigel2018-01-041-8/+63
| * | test hook for system merge request hookAlexis Reigel2018-01-041-0/+20
| * | invoke SystemHooksService instead of direct modelAlexis Reigel2018-01-041-7/+3
| * | execute system hooks from projectAlexis Reigel2018-01-042-1/+25
* | | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'Sean McGivern2018-01-181-3/+10
|\ \ \ | |_|/ |/| |
| * | Fix the user-agent detail API endpoint for project snippetsNick Thomas2018-01-171-3/+10
* | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-182-8/+71
|\ \ \
| * | | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-182-8/+71
* | | | 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-182-0/+38
|\ \ \ \ \
| * | | | | 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-161-0/+21
* | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-172-0/+58
| |/ / / / |/| | | |
* | | | | Applied fixFrancisco Javier López2018-01-171-0/+43
* | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1739-136/+671
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-2/+2
| * | | | fixed markdown_spec.jsPhil Hughes2018-01-171-1/+1
| * | | | Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rbStan Hu2018-01-161-3/+3
| * | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-164-8/+92
| * | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-163-0/+107
| * | | | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-161-13/+44
| * | | | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-162-0/+22
| * | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1612-52/+51
| * | | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-166-14/+105
| * | | | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-161-0/+62
| * | | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-163-1/+70
| * | | | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-162-36/+20
| * | | | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-161-0/+9
| * | | | Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-161-4/+51
| * | | | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-163-8/+38
* | | | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-171-1/+1
* | | | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-6/+20
* | | | | Merge branch '41118-add-sorting-to-deployments-api' into 'master'Rémy Coutable2018-01-171-5/+49
|\ \ \ \ \
| * | | | | Adds sorting to deployments APIJacopo2018-01-171-5/+49
| |/ / / /
View Lorry Controller Status