Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Keep track of all storage keys in a setbvl-circuitbreaker-keys-set | Bob Van Landuyt | 2017-12-01 | 6 | -23/+42 |
| | | | | | That way we don't need the to scan the entire keyspace to get all known keys | ||||
* | Merge branch '40286-hide-full-namespace-groups-tree' into 'master' | Phil Hughes | 2017-12-01 | 3 | -2/+24 |
|\ | | | | | | | | | | | | | Show only group name by default and put full namespace in tooltip in Groups tree Closes #40286 See merge request gitlab-org/gitlab-ce!15650 | ||||
| * | Add changelog entry | kushalpandya | 2017-12-01 | 1 | -0/+6 |
| | | |||||
| * | Show only group name by default and put full namespace in tooltip | Kushal Pandya | 2017-12-01 | 2 | -2/+18 |
| | | |||||
* | | Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master' | Kamil Trzciński | 2017-12-01 | 8 | -91/+174 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| * | | Do not set pipeline source after initialization | Grzegorz Bizon | 2017-11-30 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-class | Grzegorz Bizon | 2017-11-30 | 3293 | -41135/+95843 |
| |\ \ | | | | | | | | | | | | | * 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 | 4 | -2/+11 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Extract class responsible for building a pipeline | Grzegorz Bizon | 2017-10-09 | 2 | -43/+68 |
| | | | | |||||
* | | | | Merge branch 'add_project_ci_config_path_leading_slash_validation' into 'master' | Grzegorz Bizon | 2017-12-01 | 3 | -5/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds validation for Project#ci_config_path not to contain leading slash Closes #34683 See merge request gitlab-org/gitlab-ce!15672 | ||||
| * | | | | Adds validation for Project#ci_config_path not to contain leading slash | Christiaan Van den Poel | 2017-12-01 | 3 | -5/+12 |
|/ / / / | |||||
* | | | | Merge branch 'sh-fix-root-ref-repository' into 'master' | Rémy Coutable | 2017-12-01 | 3 | -1/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was failing regularly with an Error 500 when the API branches endpoint was used. Closes #40615 | ||||
* | | | | | Merge branch 'set-ee-variable-in-trigger' into 'master' | Grzegorz Bizon | 2017-12-01 | 1 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set EE variable for package build triggers from GitLab EE repository Closes omnibus-gitlab#3006 See merge request gitlab-org/gitlab-ce!15677 | ||||
| * | | | | | Set EE variableset-ee-variable-in-trigger | Balasankar C | 2017-12-01 | 1 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'clean-capybara-config' into 'master' | Stan Hu | 2017-11-30 | 2 | -16/+56 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -16/+56 |
| | | | | | | |||||
* | | | | | | Merge branch 'psimyn-issue-note-store' into 'master' | Fatih Acet | 2017-11-30 | 24 | -68/+68 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue note store See merge request gitlab-org/gitlab-ce!15657 | ||||
| * | | | | | | issue note store | Simon Knox | 2017-11-30 | 24 | -68/+68 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'winh-select2-search-padding' into 'master' | Mike Greiling | 2017-11-30 | 1 | -5/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align Select2 search field Closes #39451 See merge request gitlab-org/gitlab-ce!15048 | ||||
| * | | | | | | Fix padding for Select2 search field | Winnie Hellmann | 2017-11-29 | 1 | -5/+13 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'bw-count-service-cache-options' into 'master' | Stan Hu | 2017-11-30 | 2 | -1/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow caching options to be specified for counting services See merge request gitlab-org/gitlab-ce!15651 | ||||
| * | | | | | | allow caching options to be specified for counting services | Brett Walker | 2017-11-30 | 2 | -1/+13 |
|/ / / / / / | |||||
* | | | | | | 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 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '40642-members-tab-not-signed-in' into 'master' | Mike Greiling | 2017-11-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project_members controller when not signed in Closes #40642 See merge request gitlab-org/gitlab-ce!15659 | ||||
| * | | | | | | Add project_members controller when not signed in40642-members-tab-not-signed-in | Annabel Dunstone Gray | 2017-11-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Update CHANGELOG.md for 10.2.3 | Michael Kozono | 2017-11-30 | 11 | -51/+19 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | Merge branch 'zj-blobs-bulk-gitaly' into 'master' | Robert Speicher | 2017-11-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Gitaly conversion [ci skip] See merge request gitlab-org/gitlab-ce!15666 | ||||
| * | | | | | | | Add link to gitaly converation | Zeger-Jan van de Weg | 2017-11-30 | 1 | -0/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This endpoint still has to be migrated, and this comment makes sure everyone knows we are aware of this one. [ci skip] | ||||
* | | | | | | | Merge branch 'patch-29' into 'master' | Sean McGivern | 2017-11-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update google.md to reflect changes in the new Google APIs Library See merge request gitlab-org/gitlab-ce!15633 | ||||
| * | | | | | | | Update google.md to reflect changes in the new Google APIs Library | Abubakar Ango | 2017-11-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Sean McGivern | 2017-11-30 | 3 | -3/+18 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fu' into 'master' Pin seed-fu to 2.3.6 since 2.3.7 is broken and add a fixture file that uses seed-fu in the test env Closes #40690 See merge request gitlab-org/gitlab-ce!15661 | ||||
| * | | | | | | | | Add a fixture file that uses seed-fu in the test env so that a borken ↵40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fu | Rémy Coutable | 2017-11-30 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seed-fu is detected Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Pin seed-fu to 2.3.6 since 2.3.7 is broken | Rémy Coutable | 2017-11-30 | 2 | -3/+3 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | Merge branch '13634-broadcast-message' into 'master' | Tim Zallmann | 2017-11-30 | 3 | -1/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broadcast message not showing up on login page Closes #13634 See merge request gitlab-org/gitlab-ce!15578 | ||||
| * | | | | | | | | Add changelog entry13634-broadcast-message | Kushal Pandya | 2017-11-28 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix broadcast message not showing up on login page | Kushal Pandya | 2017-11-28 | 2 | -1/+6 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'gitaly-test-home' into 'master' | Rémy Coutable | 2017-11-30 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Set an artificial $HOME for gitaly in test See merge request gitlab-org/gitlab-ce!15614 | ||||
| * | | | | | | | Set an artificial $HOME for gitaly in test | Jacob Vosmaer (GitLab) | 2017-11-30 | 2 | -1/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master' | Grzegorz Bizon | 2017-11-30 | 28 | -241/+589 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -4/+9 |
| | | | | | | | | |||||
| * | | | | | | | Fix integraetion tests | Shinya Maeda | 2017-11-28 | 2 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix static analysys | Shinya Maeda | 2017-11-28 | 4 | -5/+6 |
| | | | | | | | | |||||
| * | | | | | | | Fix unit tests | Shinya Maeda | 2017-11-28 | 4 | -12/+15 |
| | | | | | | | | |||||
| * | | | | | | | Aling shared_exmaples to "same behavior between KubernetesService and ↵ | Shinya Maeda | 2017-11-28 | 13 | -86/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes" |