summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Import axios utils in commons39727-add-axios-to-commonFilipa Lacerda2017-12-042-0/+6
|
* Merge branch '38862-email-notifications-not-sent-as-expected' into 'master'Douwe Maan2017-12-043-6/+41
|\ | | | | | | | | | | | | Resolve "Email notifications not sent as expected" Closes #38862 See merge request gitlab-org/gitlab-ce!15686
| * Fix watch level for mentions in descriptionSean McGivern2017-12-043-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a user with the mention notification level set, the type of their corresponding NotificationRecipient must be :mention for them to receive an email. We set this correctly on notes, but we weren't adding it on new issues or MRs - perhaps because these users are also participants. But the type of the NotificationRecipient in that case would be :participant, not mention, so we have to add the mentioned users manually when creating an issue or MR. When editing an issue or MR, and there are newly-mentioned users to email, we still use the :new_issue and :new_merge_request actions, so this works for that case as well.
* | Merge branch '40770-doc-elasticsearch' into 'master'Rémy Coutable2017-12-043-2/+7
|\ \ | | | | | | | | | | | | | | | | | | Fix typo in Elasticsearch Closes #40770 See merge request gitlab-org/gitlab-ce!15699
| * | Fix typo in docs about ElasticsearchTakuya Noguchi2017-12-033-2/+7
| |/
* | Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-048-72/+61
|\ \ | | | | | | | | | | | | | | | | | | Fix the fork project functionality for projects with hashed storage Closes #40711 See merge request gitlab-org/gitlab-ce!15671
| * | Fix the fork project functionality for projects with hashed storageNick Thomas2017-12-048-72/+61
| |/ | | | | | | Note the dependency on gitlab-shell v5.10.0
* | Merge branch 'docs/mermaid-gl-version' into 'master'Achilleas Pipinellis2017-12-041-8/+11
|\ \ | | | | | | | | | | | | Add version that the mermaid support was introduced See merge request gitlab-org/gitlab-ce!15688
| * | Add version mermaid support was introduceddocs/mermaid-gl-versionAchilleas Pipinellis2017-12-011-8/+11
| | |
* | | Merge branch '24129-underline-all-links' into 'master'Phil Hughes2017-12-0424-42/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add underline hover state to all links Closes #24129 See merge request gitlab-org/gitlab-ce!15638
| * | | Add underline hover state to all linksAnnabel Dunstone Gray2017-12-0424-42/+59
|/ / /
* | | Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-046-23/+42
|\ \ \ | | | | | | | | | | | | | | | | 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-setBob Van Landuyt2017-12-016-23/+42
| |/ / | | | | | | | | | | | | That way we don't need the to scan the entire keyspace to get all known keys
* | | Merge branch 'fj-40407-missing-order-paginate' into 'master'Douwe Maan2017-12-046-2/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added default order to UserFinder Closes #40407 See merge request gitlab-org/gitlab-ce!15679
| * | | Added default order to UserFinderFrancisco Javier López2017-12-046-2/+44
|/ / /
* | | Merge branch 'rs-test-seed' into 'master'Rémy Coutable2017-12-041-1/+2
|\ \ \ | |_|/ |/| | | | | | | | Don't disable the Rails mailer when seeding the test environment See merge request gitlab-org/gitlab-ce!15690
| * | Don't disable the Rails mailer when seeding the test environmentrs-test-seedRobert Speicher2017-12-011-1/+2
|/ /
* | 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