Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-inconsistent-cancel-button' into 'master' | Clement Ho | 2018-06-25 | 1 | -1/+1 |
|\ | |||||
| * | Change button text to more specific Discard draftfix-inconsistent-cancel-button | Andreas Kämmerle | 2018-06-25 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 5 | -16/+79 |
|\ \ | |||||
| * \ | Merge branch 'security-html_escape_branch_name' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+19 |
| |\ \ | |||||
| | * | | HTML escape branch name in project graphs page | Imre Farkas | 2018-06-19 | 1 | -1/+19 |
| * | | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas... | Alessio Caiazza | 2018-06-25 | 1 | -13/+32 |
| |\ \ \ | |||||
| | * | | | Hide events from internal projects in public feed for anonymous users | Rubén Dávila | 2018-06-12 | 1 | -13/+32 |
| * | | | | Merge branch 'security-html_escape_usernames' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+8 |
| |\ \ \ \ | |||||
| | * | | | | HTML escape the name of the user in ProjectsHelper#link_to_member | Imre Farkas | 2018-06-15 | 1 | -1/+8 |
| * | | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -0/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix xss for Markdown elements where [[_TOC_]] is enabled | Mark Chao | 2018-06-16 | 1 | -0/+9 |
| * | | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+11 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into 'security-fj-bumping-sanitize-gem' | Douwe Maan | 2018-06-18 | 38 | -233/+318 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Whitelist text-align property for th and td | Douwe Maan | 2018-06-18 | 1 | -1/+11 |
* | | | | | | | | | Honor saml assurance level to allow 2FA bypassing | Roger Rüttimann | 2018-06-25 | 8 | -92/+332 |
* | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 2 | -30/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Moves another RPC to mandatory | Zeger-Jan van de Weg | 2018-06-25 | 2 | -30/+20 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-is-anchestor' into 'master' | Douwe Maan | 2018-06-25 | 1 | -278/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update remote happens through Gitaly only | Zeger-Jan van de Weg | 2018-06-25 | 1 | -278/+27 |
* | | | | | | | | | | Merge branch 'zj-write-config' into 'master' | Douwe Maan | 2018-06-25 | 1 | -31/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Write Config is mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -31/+21 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'unify-delete_user_worker_spec.rb' into 'master' | Douwe Maan | 2018-06-25 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Prefer `expect_next_instance_of` over `expect_any_instance_of`unify-delete_user_worker_spec.rb | Lin Jen-Shin | 2018-06-25 | 1 | -4/+6 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -11/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -11/+1 |
* | | | | | | | | | | | Notify conflict only for opened/locked merge requests | Mark Chao | 2018-06-25 | 1 | -22/+40 |
* | | | | | | | | | | | Resolve "WebHookService doesn't handle user info with nil passwords" | Jan Beckmann | 2018-06-25 | 1 | -0/+30 |
* | | | | | | | | | | | Merge branch 'ide-tab-active-click-fix' into 'master' | Filipa Lacerda | 2018-06-25 | 1 | -3/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed the IDE commit list item loosing its active stateide-tab-active-click-fix | Phil Hughes | 2018-06-25 | 1 | -3/+23 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master' | Grzegorz Bizon | 2018-06-25 | 3 | -14/+68 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Enforce setting string as value of the CI/CD variable | Tomasz Maczukin | 2018-06-25 | 3 | -14/+68 |
* | | | | | | | | | | | Merge branch 'unify-test_bundle.js' into 'master' | Phil Hughes | 2018-06-25 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-25 | 1 | -1/+0 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'osw-delete-non-latest-mr-diff-files-upon-merge' into 'master' | Sean McGivern | 2018-06-25 | 7 | -58/+223 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-merge | Oswaldo Ferreira | 2018-06-24 | 7 | -58/+223 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'unify-filtered_search_token_keys_spec.js' into 'master' | Phil Hughes | 2018-06-25 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Bring changes from EEunify-filtered_search_token_keys_spec.js | Lin Jen-Shin | 2018-06-22 | 1 | -0/+11 |
* | | | | | | | | | | | Resolve "2FA should not attempt to use U2F in unsupported browsers" | Jan Beckmann | 2018-06-25 | 1 | -30/+54 |
* | | | | | | | | | | | Adds test to cover the fix in #45575 | Sanad Liaquat | 2018-06-24 | 1 | -0/+9 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'unify-match_ids.rb' into 'master' | Robert Speicher | 2018-06-22 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-22 | 1 | -0/+7 |
* | | | | | | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-22 | 1 | -0/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master' | Kamil Trzciński | 2018-06-22 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | [Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-spec | blackst0ne | 2018-06-16 | 1 | -8/+0 |
* | | | | | | | | | | | Merge branch 'update-large-tables-cop' into 'master' | Grzegorz Bizon | 2018-06-22 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Disallow methods that copy data on large tables | Sean McGivern | 2018-06-19 | 1 | -0/+20 |
* | | | | | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master' | Yorick Peterse | 2018-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gc | Ben Kochie | 2018-06-22 | 1 | -1/+1 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'unify-filter_issues_spec.rb' into 'master' | Nick Thomas | 2018-06-22 | 1 | -2/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Bring changes from EEunify-filter_issues_spec.rb | Lin Jen-Shin | 2018-06-21 | 1 | -2/+34 |