Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Migrate Gitlab::Git::Repository#cherry_pick to Gitalyfeature/migrate-cherry-pick-to-gitaly | Ahmad Sherif | 2017-12-04 | 1 | -25/+35 |
| | | | | Closes gitaly#737 | ||||
* | Merge branch 'bvl-circuitbreaker-keys-set' into 'master' | Douwe Maan | 2017-12-04 | 2 | -0/+20 |
|\ | | | | | | | | | Keep track of all storage keys in a set See merge request gitlab-org/gitlab-ce!15613 | ||||
| * | Keep track of all storage keys in a setbvl-circuitbreaker-keys-set | Bob Van Landuyt | 2017-12-01 | 2 | -0/+20 |
| | | | | | | | | | | That way we don't need the to scan the entire keyspace to get all known keys | ||||
* | | Added default order to UserFinder | Francisco Javier López | 2017-12-04 | 1 | -0/+21 |
| | | |||||
* | | Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` ↵ | Rémy Coutable | 2017-12-01 | 1 | -0/+2 |
|/ | | | | | | and fix a transient failing spec due to that Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master' | Kamil Trzciński | 2017-12-01 | 5 | -47/+104 |
|\ | | | | | | | | | | | | | Extract class responsible for building a pipeline Closes #38460 See merge request gitlab-org/gitlab-ce!14762 | ||||
| * | Fix pipeline config source specs and test it explicitly | Grzegorz Bizon | 2017-11-30 | 1 | -41/+38 |
| | | |||||
| * | Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-class | Grzegorz Bizon | 2017-11-30 | 1136 | -12218/+38280 |
| |\ | | | | | | | | | | * master: (1794 commits) | ||||
| * | | Extend pipeline build chain specsbackstage/gb/build-pipeline-in-a-separate-class | Grzegorz Bizon | 2017-10-11 | 1 | -0/+8 |
| | | | |||||
| * | | Set pipeline config source attribute in a build step | Grzegorz Bizon | 2017-10-11 | 3 | -2/+9 |
| | | | |||||
| * | | Add initial specs for pipeline build chain class | Grzegorz Bizon | 2017-10-10 | 1 | -0/+43 |
| | | | |||||
| * | | Improve post_receive spec by not stubbing private methods | Grzegorz Bizon | 2017-10-10 | 1 | -5/+7 |
| | | | |||||
* | | | Adds validation for Project#ci_config_path not to contain leading slash | Christiaan Van den Poel | 2017-12-01 | 1 | -2/+3 |
| | | | |||||
* | | | Merge branch 'sh-fix-root-ref-repository' into 'master' | Rémy Coutable | 2017-12-01 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle case when repository's root ref does not exist Closes #40615 See merge request gitlab-org/gitlab-ce!15678 | ||||
| * | | | Gracefully handle case when repository's root ref does not existsh-fix-root-ref-repository | Stan Hu | 2017-11-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was failing regularly with an Error 500 when the API branches endpoint was used. Closes #40615 | ||||
* | | | | Merge branch 'clean-capybara-config' into 'master' | Stan Hu | 2017-11-30 | 1 | -8/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up Capybara configuration Closes #40599 See merge request gitlab-org/gitlab-ce!15644 | ||||
| * | | | | add logging back to capybara config and clean up selenium option instantiationclean-capybara-config | Mike Greiling | 2017-11-29 | 1 | -8/+28 |
| | | | | | |||||
* | | | | | issue note store | Simon Knox | 2017-11-30 | 12 | -34/+34 |
| | | | | | |||||
* | | | | | allow caching options to be specified for counting services | Brett Walker | 2017-11-30 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch 'improve-require-input-spec' into 'master' | Fatih Acet | 2017-11-30 | 1 | -36/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve require input spec See merge request gitlab-org/gitlab-ce!15654 | ||||
| * | | | | | Improve require input specimprove-require-input-spec | Clement Ho | 2017-11-29 | 1 | -36/+40 |
| |/ / / / | |||||
* | | | | | Set an artificial $HOME for gitaly in test | Jacob Vosmaer (GitLab) | 2017-11-30 | 1 | -0/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master' | Grzegorz Bizon | 2017-11-30 | 16 | -179/+462 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515 | ||||
| * | | | | Fix feature spec38668-revert-copied-kubernetesservice-logic | Shinya Maeda | 2017-11-28 | 2 | -3/+9 |
| | | | | | |||||
| * | | | | Fix integraetion tests | Shinya Maeda | 2017-11-28 | 2 | -2/+1 |
| | | | | | |||||
| * | | | | Fix static analysys | Shinya Maeda | 2017-11-28 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Fix unit tests | Shinya Maeda | 2017-11-28 | 3 | -11/+12 |
| | | | | | |||||
| * | | | | Aling shared_exmaples to "same behavior between KubernetesService and ↵ | Shinya Maeda | 2017-11-28 | 12 | -85/+36 |
| | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes" | ||||
| * | | | | Replce kubernetes_service and deployment_service to deployment_platform | Shinya Maeda | 2017-11-28 | 9 | -154/+113 |
| | | | | | |||||
| * | | | | Duplicate spec for Platform::Kubernetes with kubernetes_project | Shinya Maeda | 2017-11-28 | 5 | -44/+102 |
| | | | | | |||||
| * | | | | Add test for checking interchangeability between KubernetesService and ↵ | Shinya Maeda | 2017-11-28 | 1 | -0/+45 |
| | | | | | | | | | | | | | | | | | | | | Clusters::Platform::Kubernetes | ||||
| * | | | | Add test suit for platform::kubernetes | Shinya Maeda | 2017-11-28 | 7 | -75/+212 |
| | | | | | |||||
| * | | | | Fix tests for Clusters::Platforms::Kubernetes | Shinya Maeda | 2017-11-28 | 1 | -12/+4 |
| | | | | | |||||
| * | | | | Revert KubernetesService logic in Platforms::Kubernetes | Shinya Maeda | 2017-11-28 | 1 | -0/+135 |
| | | | | | |||||
* | | | | | Merge branch 'multi-file-editor-dirty-diff-indicator' into 'master' | Tim Zallmann | 2017-11-30 | 9 | -3/+727 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor dirty diff indicator Closes #40046 See merge request gitlab-org/gitlab-ce!15423 | ||||
| * | | | | | updated diff spec | Phil Hughes | 2017-11-30 | 1 | -31/+31 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into multi-file-editor-dirty-diff-indicator | Phil Hughes | 2017-11-30 | 59 | -909/+2189 |
| |\ \ \ \ \ | |||||
| * | | | | | | added editor options to redcue EE conflicts | Phil Hughes | 2017-11-29 | 1 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | fixed failing specs | Phil Hughes | 2017-11-28 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | added specs | Phil Hughes | 2017-11-28 | 7 | -0/+713 |
| | | | | | | | |||||
* | | | | | | | fix for special charecter in file names | haseeb | 2017-11-30 | 1 | -0/+9 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master' | Tim Zallmann | 2017-11-30 | 1 | -13/+42 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334 | ||||
| * | | | | | | Added ssh_button helper specs and addressed ruby code observations | Jose Ivan Vargas | 2017-11-27 | 1 | -14/+41 |
| | | | | | | | |||||
| * | | | | | | UX adjustments and spec corrections | Jose Ivan Vargas | 2017-11-27 | 1 | -5/+7 |
| | | | | | | | |||||
* | | | | | | | Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messages | Eric Eastwood | 2017-11-29 | 1 | -0/+22 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil` | ||||
* | | | | | | Merge branch 'bvl-double-fork' into 'master' | Phil Hughes | 2017-11-29 | 1 | -1/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653 | ||||
| * | | | | | | Redirect to an already forked project if it exists | Bob Van Landuyt | 2017-11-29 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect. | ||||
* | | | | | | | support ordering of project notes in notes api | haseeb | 2017-11-29 | 1 | -0/+124 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'remove-mr-diff-serialised-columns' into 'master' | Yorick Peterse | 2017-11-29 | 7 | -456/+402 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove serialised diff and commit columns Closes #39533 See merge request gitlab-org/gitlab-ce!15582 | ||||
| * | | | | | | | Remove serialised diff and commit columns | Sean McGivern | 2017-11-28 | 7 | -456/+402 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit. |