summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Correct sidebar-item-icon margin and vertical align40631-sidebar-icon-alignment-for-confidentiality-and-lock-issue-is-misalignedLuke Bennett2017-12-021-8/+8
|
* Merge branch 'docs_ext_redmine_fix' into 'master'40651-comment-is-lost-when-leaving-page-while-submittingAchilleas Pipinellis2017-12-012-13/+16
|\ | | | | | | | | Documentation bug fixes: Added procedure to disable built-in Issues. See merge request gitlab-org/gitlab-ce!15581
| * Documentation bug fixes: Added procedure to disable built-in Issues.Koichiro Mikami2017-12-012-13/+16
|/
* Merge branch ↵Robert Speicher2017-12-012-1/+3
|\ | | | | | | | | | | | | | | | | '40746-broken-master-due-to-failure-in-spec-services-clusters-applications-schedule_installation_service_spec-rb' into 'master' Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` and fix a transient failing spec due to that Closes #40746 See merge request gitlab-org/gitlab-ce!15684
| * Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` ↵Rémy Coutable2017-12-012-1/+3
|/ | | | | | and fix a transient failing spec due to that Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '40286-hide-full-namespace-groups-tree' into 'master'Phil Hughes2017-12-013-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 entrykushalpandya2017-12-011-0/+6
| |
| * Show only group name by default and put full namespace in tooltipKushal Pandya2017-12-012-2/+18
| |
* | Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master'Kamil Trzciński2017-12-018-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 explicitlyGrzegorz Bizon2017-11-301-41/+38
| | |
| * | Do not set pipeline source after initializationGrzegorz Bizon2017-11-301-1/+0
| | |
| * | Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-classGrzegorz Bizon2017-11-303293-41135/+95843
| |\ \ | | | | | | | | | | | | * master: (1794 commits)
| * | | Extend pipeline build chain specsbackstage/gb/build-pipeline-in-a-separate-classGrzegorz Bizon2017-10-111-0/+8
| | | |
| * | | Set pipeline config source attribute in a build stepGrzegorz Bizon2017-10-114-2/+11
| | | |
| * | | Add initial specs for pipeline build chain classGrzegorz Bizon2017-10-101-0/+43
| | | |
| * | | Improve post_receive spec by not stubbing private methodsGrzegorz Bizon2017-10-101-5/+7
| | | |
| * | | Extract class responsible for building a pipelineGrzegorz Bizon2017-10-092-43/+68
| | | |
* | | | Merge branch 'add_project_ci_config_path_leading_slash_validation' into 'master'Grzegorz Bizon2017-12-013-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 slashChristiaan Van den Poel2017-12-013-5/+12
|/ / / /
* | | | Merge branch 'sh-fix-root-ref-repository' into 'master'Rémy Coutable2017-12-013-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-repositoryStan Hu2017-11-303-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 Bizon2017-12-011-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-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
| | | | | | | |