| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove a bunch of superfluous common_vue bundlesdispatcher-cleanup | Mike Greiling | 2018-02-28 | 4 | -10/+0 |
| | | |||||
| * | Merge branch 'remove-merge-conflicts-bundle' into 'master' | Jacob Schatz | 2018-02-28 | 2 | -4/+0 |
| |\ | | | | | | | | | Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408 | ||||
| | * | remove merge_conflicts bundle in favor of pages directory entry point | Mike Greiling | 2018-02-27 | 2 | -4/+0 |
| | | | |||||
| * | | Render MR Notes with Vue with behind a cookie | Fatih Acet | 2018-02-28 | 3 | -29/+34 |
| |/ | |||||
| * | Move the #update action from Project/Member controllers to the ↵ | Rémy Coutable | 2018-02-27 | 1 | -4/+0 |
| | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'refactor-commit-show' into 'master' | Phil Hughes | 2018-02-27 | 1 | -1/+0 |
| |\ | | | | | | | | | Remove diff notes webpack entry point See merge request gitlab-org/gitlab-ce!17382 | ||||
| | * | Merge branch 'master' into 'refactor-commit-show'refactor-commit-show | Phil Hughes | 2018-02-27 | 3 | -3/+1 |
| | |\ | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * \ | Merge branch 'master' into refactor-commit-show | Clement Ho | 2018-02-26 | 2 | -26/+28 |
| | |\ \ | |||||
| | * | | | Remove diff notes webpack entry point | Clement Ho | 2018-02-26 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tags | Phil Hughes | 2018-02-27 | 6 | -32/+29 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | # Conflicts: # app/assets/javascripts/pages/projects/merge_requests/show/index.js | ||||
| | * | | | Merge branch 'refactor-pipelines-list' into 'master' | Phil Hughes | 2018-02-27 | 1 | -1/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Remove commit_pipelines webpack entry point See merge request gitlab-org/gitlab-ce!17379 | ||||
| | | * \ \ | Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-list | Clement Ho | 2018-02-26 | 2 | -26/+28 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | | Remove commit_pipelines webpack entry point | Clement Ho | 2018-02-26 | 1 | -1/+0 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch '43315-gpg-popover' into 'master' | Phil Hughes | 2018-02-27 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verified commits not displaying properly" Closes #43315 See merge request gitlab-org/gitlab-ce!17323 | ||||
| | | * | | | Add missing class to parent element and remove extra CSS43315-gpg-popover | Filipa Lacerda | 2018-02-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folder | Clement Ho | 2018-02-26 | 2 | -26/+28 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵ | Mayra Cabrera | 2018-02-26 | 2 | -26/+28 |
| | | | |/ | | |/| | | | | | | | | | -> edit Prometheus Service Template" | ||||
| | * | | | Remove environments folder webpack entry point | Clement Ho | 2018-02-26 | 1 | -1/+0 |
| | |/ / | |||||
| | * | | Remove webpack bundle tags for blob | Jacob Schatz | 2018-02-26 | 1 | -3/+0 |
| | | | | |||||
| * | | | Converted webpack_bundle_tag to be automatic webpack bundles | Phil Hughes | 2018-02-26 | 3 | -8/+0 |
| |/ / | |||||
| * | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵ | Douwe Maan | 2018-02-26 | 3 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851 | ||||
| | * | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helper | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | inline methods | James Lopez | 2018-02-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | refactor code based on feedback | James Lopez | 2018-02-23 | 2 | -3/+3 |
| | | | | |||||
| | * | | some initial refactoring | James Lopez | 2018-02-23 | 2 | -3/+3 |
| | | | | |||||
| * | | | Don't convert issuable_initial_data into JSONjprovazn-issuable-data | Jan Provaznik | 2018-02-26 | 1 | -1/+1 |
| | |/ |/| | | | | | | | | | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json | ||||
| * | | Merge branch 'backport-qa_78' into 'master' | Grzegorz Bizon | 2018-02-25 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | | | | QA BACKPORT - Test merge request rebase See merge request gitlab-org/gitlab-ce!17186 | ||||
| | * | | test merge request rebase | Felipe Artur | 2018-02-19 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master' | Jacob Schatz | 2018-02-23 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Refactored webpack bundle tag for deploy keys See merge request gitlab-org/gitlab-ce!17324 | ||||
| | * | | | Removed webpack tag | Constance Okoghenun | 2018-02-23 | 1 | -1/+0 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'remove-issues-show' into 'master' | Jacob Schatz | 2018-02-23 | 1 | -3/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove issue_show webpack bundle See merge request gitlab-org/gitlab-ce!17326 | ||||
| | * | | | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-show | Mike Greiling | 2018-02-23 | 1 | -3/+0 |
| | |/ / | |||||
| * | | | Backport custom metrics ce components | Paweł Chojnacki | 2018-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch '29497-pages-custom-domain-dns-verification' into 'master' | Robert Speicher | 2018-02-23 | 2 | -2/+36 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Domain validation for Pages custom domains" (master branch) Closes #29497, #42971, and #42083 See merge request gitlab-org/gitlab-ce!17311 | ||||
| | * | | | Add DNS verification to Pages custom domains | Nick Thomas | 2018-02-23 | 2 | -2/+36 |
| | |/ / | |||||
| * | | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master' | Filipa Lacerda | 2018-02-23 | 3 | -6/+5 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Add a button to deploy a runner to a Kubernetes cluster in the settings page Closes #42044 See merge request gitlab-org/gitlab-ce!17278 | ||||
| | * | | Add a button to deploy a runner to a Kubernetes cluster in the settings page42044-osw-add-button-to-deploy-runner-to-kubernetes | Oswaldo Ferreira | 2018-02-23 | 3 | -6/+5 |
| | | | | |||||
| * | | | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master' | Phil Hughes | 2018-02-23 | 1 | -7/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Keep "Import project" tab/form active when validation fails trying to import "Repo by URL" Closes #43261 See merge request gitlab-org/gitlab-ce!17136 | ||||
| | * | | | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tab | Eric Eastwood | 2018-02-20 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43261 | ||||
| * | | | | Add Tip about Push to Create project on New Project page | André Luís | 2018-02-23 | 2 | -0/+18 |
| | | | | | |||||
| * | | | | Unify use of can_current_user_push_code Presenter42431-add-auto-devops-and-clusters-button-to-projects | Oswaldo Ferreira | 2018-02-22 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Move project presenter instance creation to controller | Oswaldo Ferreira | 2018-02-22 | 2 | -2/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projects | Eric Eastwood | 2018-02-22 | 48 | -102/+50 |
| |\ \ \ \ | |||||
| | * | | | | Rest of Dispatcher Refactor | Jacob Schatz | 2018-02-21 | 5 | -8/+1 |
| | | |/ / | |/| | | |||||
| | * | | | Merge branch 'ce-3776-ci-view-for-sast' into 'master' | Phil Hughes | 2018-02-21 | 1 | -6/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n See merge request gitlab-org/gitlab-ce!17176 | ||||
| | | * | | | CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sast | Filipa Lacerda | 2018-02-20 | 1 | -6/+6 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | Backport common class name for the tab content Backport more changes | ||||
| | * | | | Update to jQuery 3. | Jacob Schatz | 2018-02-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'issue-index-refactor' into 'master' | Clement Ho | 2018-02-20 | 1 | -1/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor issue index filtered search See merge request gitlab-org/gitlab-ce!16981 | ||||
| | | * | | | Refactor issue index filtered searchissue-index-refactor | Jacob Schatz | 2018-02-12 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'refactor-jobs-show-haml' into 'master' | Jacob Schatz | 2018-02-20 | 1 | -4/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add dispatcher imports for job details bundle See merge request gitlab-org/gitlab-ce!17157 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |