summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-inconsistent-cancel-button' into 'master'Clement Ho2018-06-251-1/+1
|\
| * Change button text to more specific Discard draftfix-inconsistent-cancel-buttonAndreas Kämmerle2018-06-251-1/+1
* | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-255-16/+79
|\ \
| * \ Merge branch 'security-html_escape_branch_name' into 'master'Alessio Caiazza2018-06-251-1/+19
| |\ \
| | * | HTML escape branch name in project graphs pageImre Farkas2018-06-191-1/+19
| * | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas...Alessio Caiazza2018-06-251-13/+32
| |\ \ \
| | * | | Hide events from internal projects in public feed for anonymous usersRubén Dávila2018-06-121-13/+32
| * | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-251-1/+8
| |\ \ \ \
| | * | | | HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-151-1/+8
| * | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-251-0/+9
| |\ \ \ \ \
| | * | | | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-161-0/+9
| * | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-1/+11
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-1838-233/+318
| | |\ \ \ \ \ \
| | * | | | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-181-1/+11
* | | | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-258-92/+332
* | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-252-30/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-252-30/+20
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-251-278/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-251-278/+27
* | | | | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-251-31/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-251-31/+21
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'unify-delete_user_worker_spec.rb' into 'master'Douwe Maan2018-06-251-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prefer `expect_next_instance_of` over `expect_any_instance_of`unify-delete_user_worker_spec.rbLin Jen-Shin2018-06-251-4/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-251-11/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-251-11/+1
* | | | | | | | | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-251-22/+40
* | | | | | | | | | | Resolve "WebHookService doesn't handle user info with nil passwords"Jan Beckmann2018-06-251-0/+30
* | | | | | | | | | | Merge branch 'ide-tab-active-click-fix' into 'master'Filipa Lacerda2018-06-251-3/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed the IDE commit list item loosing its active stateide-tab-active-click-fixPhil Hughes2018-06-251-3/+23
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-253-14/+68
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-253-14/+68
* | | | | | | | | | | Merge branch 'unify-test_bundle.js' into 'master'Phil Hughes2018-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-251-1/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'osw-delete-non-latest-mr-diff-files-upon-merge' into 'master'Sean McGivern2018-06-257-58/+223
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-247-58/+223
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'unify-filtered_search_token_keys_spec.js' into 'master'Phil Hughes2018-06-251-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bring changes from EEunify-filtered_search_token_keys_spec.jsLin Jen-Shin2018-06-221-0/+11
* | | | | | | | | | | Resolve "2FA should not attempt to use U2F in unsupported browsers"Jan Beckmann2018-06-251-30/+54
* | | | | | | | | | | Adds test to cover the fix in #45575Sanad Liaquat2018-06-241-0/+9
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'unify-match_ids.rb' into 'master'Robert Speicher2018-06-221-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-221-0/+7
* | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-221-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'Kamil Trzciński2018-06-221-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-specblackst0ne2018-06-161-8/+0
* | | | | | | | | | | Merge branch 'update-large-tables-cop' into 'master'Grzegorz Bizon2018-06-221-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Disallow methods that copy data on large tablesSean McGivern2018-06-191-0/+20
* | | | | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-221-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'unify-filter_issues_spec.rb' into 'master'Nick Thomas2018-06-221-2/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bring changes from EEunify-filter_issues_spec.rbLin Jen-Shin2018-06-211-2/+34