summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set EE variableset-ee-variable-in-triggerBalasankar C2017-12-011-1/+5
|
* Merge branch 'clean-capybara-config' into 'master'Stan Hu2017-11-302-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-configMike Greiling2017-11-292-16/+56
| |
* | Merge branch 'psimyn-issue-note-store' into 'master'Fatih Acet2017-11-3024-68/+68
|\ \ | | | | | | | | | | | | issue note store See merge request gitlab-org/gitlab-ce!15657
| * | issue note storeSimon Knox2017-11-3024-68/+68
|/ /
* | Merge branch 'winh-select2-search-padding' into 'master'Mike Greiling2017-11-301-5/+13
|\ \ | | | | | | | | | | | | | | | | | | Align Select2 search field Closes #39451 See merge request gitlab-org/gitlab-ce!15048
| * | Fix padding for Select2 search fieldWinnie Hellmann2017-11-291-5/+13
| | |
* | | Merge branch 'bw-count-service-cache-options' into 'master'Stan Hu2017-11-302-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 servicesBrett Walker2017-11-302-1/+13
|/ / /
* | | Merge branch 'improve-require-input-spec' into 'master'Fatih Acet2017-11-301-36/+40
|\ \ \ | | | | | | | | | | | | | | | | Improve require input spec See merge request gitlab-org/gitlab-ce!15654
| * | | Improve require input specimprove-require-input-specClement Ho2017-11-291-36/+40
| | |/ | |/|
* | | Merge branch '40642-members-tab-not-signed-in' into 'master'Mike Greiling2017-11-301-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-inAnnabel Dunstone Gray2017-11-291-1/+1
| | | |
* | | | Update CHANGELOG.md for 10.2.3Michael Kozono2017-11-3011-51/+19
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'zj-blobs-bulk-gitaly' into 'master'Robert Speicher2017-11-301-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Gitaly conversion [ci skip] See merge request gitlab-org/gitlab-ce!15666
| * | | | Add link to gitaly converationZeger-Jan van de Weg2017-11-301-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 McGivern2017-11-301-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 LibraryAbubakar Ango2017-11-281-1/+1
| | | | |
* | | | | Merge branch ↵Sean McGivern2017-11-303-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-fuRémy Coutable2017-11-301-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 brokenRémy Coutable2017-11-302-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 Zallmann2017-11-303-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-messageKushal Pandya2017-11-281-0/+5
| | | | | | |
| * | | | | | Fix broadcast message not showing up on login pageKushal Pandya2017-11-282-1/+6
| | | | | | |
* | | | | | | Merge branch 'gitaly-test-home' into 'master'Rémy Coutable2017-11-302-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 testJacob Vosmaer (GitLab)2017-11-302-1/+5
|/ / / / / /
* | | | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-3028-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-logicShinya Maeda2017-11-283-4/+9
| | | | | | |
| * | | | | | Fix integraetion testsShinya Maeda2017-11-282-2/+1
| | | | | | |
| * | | | | | Fix static analysysShinya Maeda2017-11-284-5/+6
| | | | | | |
| * | | | | | Fix unit testsShinya Maeda2017-11-284-12/+15
| | | | | | |
| * | | | | | Aling shared_exmaples to "same behavior between KubernetesService and ↵Shinya Maeda2017-11-2813-86/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes"
| * | | | | | Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-2818-183/+130
| | | | | | |
| * | | | | | Duplicate spec for Platform::Kubernetes with kubernetes_projectShinya Maeda2017-11-285-44/+102
| | | | | | |
| * | | | | | Add test for checking interchangeability between KubernetesService and ↵Shinya Maeda2017-11-281-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clusters::Platform::Kubernetes
| * | | | | | Add test suit for platform::kubernetesShinya Maeda2017-11-288-82/+219
| | | | | | |
| * | | | | | Remove logic which glues with KubernetesService, from Platforms::KubernetesShinya Maeda2017-11-282-57/+3
| | | | | | |
| * | | | | | Fix commentsShinya Maeda2017-11-281-0/+1
| | | | | | |
| * | | | | | Add deployment platform selectorShinya Maeda2017-11-281-2/+12
| | | | | | |
| * | | | | | Fix tests for Clusters::Platforms::KubernetesShinya Maeda2017-11-281-12/+4
| | | | | | |
| * | | | | | Check diff between KubernetesService and Platforms::Kubernetes. Synchronize ↵Shinya Maeda2017-11-282-67/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | again.
| * | | | | | Revert KubernetesService logic in Platforms::KubernetesShinya Maeda2017-11-282-0/+258
| |/ / / / /
* | | | | | Merge branch 'multi-file-editor-dirty-diff-indicator' into 'master'Tim Zallmann2017-11-3024-41/+1157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor dirty diff indicator Closes #40046 See merge request gitlab-org/gitlab-ce!15423
| * | | | | | updated diff specPhil Hughes2017-11-301-31/+31
| | | | | | |
| * | | | | | Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-30218-2646/+4858
| |\ \ \ \ \ \
| * | | | | | | added editor options to redcue EE conflictsPhil Hughes2017-11-293-0/+19
| | | | | | | |
| * | | | | | | fixed failing specsPhil Hughes2017-11-283-10/+19
| | | | | | | |
| * | | | | | | fixed scss-lintPhil Hughes2017-11-281-4/+4
| | | | | | | |
| * | | | | | | added specsPhil Hughes2017-11-288-22/+714
| | | | | | | |
| * | | | | | | fixed web worker performancePhil Hughes2017-11-285-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
View Lorry Controller Status