Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added Diff Viewer to new VUE based MR page | Tim Zallmann | 2018-06-26 | 4 | -10/+109 |
* | Fixed eslint failure in IDE spec helpers | Phil Hughes | 2018-06-26 | 1 | -2/+2 |
* | Show file in tree on WebIDE open | Paul Slaughter | 2018-06-26 | 2 | -3/+59 |
* | Merge branch 'prefer-destructuring-fix' into 'master' | Mike Greiling | 2018-06-26 | 19 | -28/+28 |
|\ | |||||
| * | Enable "prefer-destructuring" in JS files | gfyoung | 2018-06-25 | 19 | -28/+28 |
* | | Merge branch 'dm-branch-api-can-push-fix' into 'master' | Robert Speicher | 2018-06-26 | 1 | -0/+29 |
|\ \ | |||||
| * | | Remove duplicate spec | Douwe Maan | 2018-06-26 | 1 | -6/+0 |
| * | | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fix | Douwe Maan | 2018-06-25 | 1 | -0/+35 |
* | | | Merge branch 'ce-gitlab-elt' into 'master' | Stan Hu | 2018-06-26 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | port stub_object_storage changesce-gitlab-elt | Micaël Bergeron | 2018-06-22 | 1 | -1/+6 |
* | | | | Merge branch 'add-rename-column-background-helper' into 'master' | Yorick Peterse | 2018-06-26 | 1 | -0/+55 |
|\ \ \ \ | |||||
| * | | | | Add a helper to rename a column using a background migration | Sean McGivern | 2018-06-26 | 1 | -0/+55 |
* | | | | | Merge branch '46783-removed-omniauth-provider-causing-invalid-application-set... | Stan Hu | 2018-06-26 | 2 | -9/+50 |
|\ \ \ \ \ | |||||
| * | | | | | Ignore unknown OAuth sources in ApplicationSetting46783-removed-omniauth-provider-causing-invalid-application-setting | Rémy Coutable | 2018-06-26 | 2 | -9/+50 |
* | | | | | | Merge branch 'issue_47729' into 'master' | Sean McGivern | 2018-06-26 | 2 | -0/+89 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | BatchOpenIssuesCount only updates public issues countissue_47729 | Felipe Artur | 2018-06-25 | 1 | -2/+4 |
| * | | | | | Fix refresh cache for open issues count service | Felipe Artur | 2018-06-21 | 2 | -0/+87 |
* | | | | | | Merge branch 'unify-some-models' into 'master' | Douwe Maan | 2018-06-26 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Port Namespace#root_ancestor to CE | Lin Jen-Shin | 2018-06-26 | 1 | -0/+13 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'update_project_flash_error_message' into 'master' | Rémy Coutable | 2018-06-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Set flash error message only for current request when updating project | Aram Visser | 2018-06-25 | 1 | -1/+1 |
* | | | | | | Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er... | Robert Speicher | 2018-06-25 | 1 | -4/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix sorting by name on explore projects page | Douglas Barbosa Alexandre | 2018-06-25 | 1 | -4/+14 |
* | | | | | | | Improve shelling out in bin/changelog | Jacob Vosmaer (GitLab) | 2018-06-25 | 1 | -5/+6 |
|/ / / / / / | |||||
* | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-26 | 1 | -1/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | 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 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |