Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add locked state to merge request API | Chantal Rollison | 2018-06-28 | 3 | -15/+32 |
* | Migrate storage nesting check to Gitaly | Jacob Vosmaer (GitLab) | 2018-06-27 | 1 | -43/+0 |
* | Merge branch 'fl-tech-debt' into 'master' | Phil Hughes | 2018-06-27 | 1 | -2/+2 |
|\ | |||||
| * | Moves boards components into a .vue filefl-tech-debt | Filipa Lacerda | 2018-06-26 | 1 | -2/+2 |
* | | Merge branch 'zj-gitaly-read-write-check' into 'master' | Nick Thomas | 2018-06-27 | 5 | -206/+46 |
|\ \ | |||||
| * | | Gitaly metrics check for read/writeability | Zeger-Jan van de Weg | 2018-06-27 | 5 | -206/+46 |
* | | | Merge branch '48528-fix-mr-autocompletion' into 'master' | Sean McGivern | 2018-06-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix merge requests data source key to be camelCase | Kushal Pandya | 2018-06-27 | 1 | -1/+1 |
* | | | | CE port gitlab-ee!6112 | Luke Bennett | 2018-06-27 | 2 | -27/+56 |
|/ / / | |||||
* | | | Merge branch 'rs-spec-models-parity' into 'master' | Rémy Coutable | 2018-06-27 | 1 | -7/+29 |
|\ \ \ | |||||
| * | | | CE-EE parity for spec/models/repository_spec.rbrs-spec-models-parity | Robert Speicher | 2018-06-25 | 1 | -7/+29 |
* | | | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master' | Sean McGivern | 2018-06-27 | 1 | -20/+11 |
|\ \ \ \ | |||||
| * | | | | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dot | Jacob Vosmaer | 2018-06-26 | 1 | -20/+11 |
* | | | | | Resolve "Copying ordered list to new comment becomes unordered" | Jan Beckmann | 2018-06-27 | 1 | -0/+55 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'acet-mr-diffs-autosave' into 'master' | Tim Zallmann | 2018-06-26 | 1 | -1/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-diffs-a... | Fatih Acet | 2018-06-26 | 46 | -612/+1179 |
| |\ \ \ \ | |||||
| * | | | | | Implement MR diff notes autosave feature.acet-mr-diffs-autosave | Fatih Acet | 2018-06-22 | 1 | -1/+18 |
* | | | | | | 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 |
| |\ \ \ \ \ \ \ \ |