summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add note about only 20 commits being included in push payloaddocs-push-web-hook-noteDrew Blessing2017-12-271-0/+6
|
* Merge branch 'sh-make-kib-human' into 'master'Filipa Lacerda2017-12-274-7/+12
|\ | | | | | | | | | | | | Humanize the units of "Showing last X KiB of log" in job trace Closes #38613 See merge request gitlab-org/gitlab-ce!16147
| * Humanize the units of "Showing last X KiB of log" in job tracesh-make-kib-humanStan Hu2017-12-274-7/+12
| | | | | | | | Closes #38613
* | Merge branch 'sh-fix-mysql-migration-10-3' into 'master'Grzegorz Bizon2017-12-273-2/+44
|\ \ | |/ |/| | | | | | | | | Fix migration for removing orphaned issues.moved_to_id values in MySQL and PostgreSQL Closes #41498 See merge request gitlab-org/gitlab-ce!16141
| * Simplify implementation and allow for batch updates in MySQLStan Hu2017-12-271-27/+16
| |
| * Fix PostgreSQL implementation of migrationsh-fix-mysql-migration-10-3Stan Hu2017-12-273-3/+5
| |
| * Fix migration for removing orphaned issues.moved_to_id values in MySQLStan Hu2017-12-263-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://dev.mysql.com/doc/refman/5.7/en/update.html, "You cannot update a table and select from the same table in a subquery." Attempting to do so results in the error: ``` Mysql2::Error: Table 'issues' is specified twice, both as a target for 'UPDATE' and as a separate source for data ``` Instead, we can use a LEFT JOIN on the same table to make MySQL do the right thing. Closes #41498
* | Merge branch 'fix_db_fixtures_06_teams' into 'master'Stan Hu2017-12-271-1/+1
|\ \ | | | | | | | | | | | | Fix Gitlab::Access.values to Gitlab::Access.sym_options at 06_teams on development db fixtures See merge request gitlab-org/gitlab-ce!16144
| * | Fix Gitlab::Access.values to Gitlab::Access.sym_options at 06_teams on ↵ogom2017-12-271-1/+1
| | | | | | | | | | | | development db fixtures
* | | Update CHANGELOG.md for 10.3.1Tiago Botelho2017-12-276-26/+13
|/ / | | | | [ci skip]
* | Merge branch 'osw-use-atomic-reference-instead-atomic-fixnum' into 'master'Stan Hu2017-12-272-1/+6
|\ \ | |/ |/| | | | | | | | | Use Concurrent::AtomicReference instead AtomicFixnum Closes #41448 See merge request gitlab-org/gitlab-ce!16138
| * Add changelogosw-use-atomic-reference-instead-atomic-fixnumOswaldo Ferreira2017-12-261-0/+5
| |
| * Use Concurrent::AtomicReference instead AtomicFixnumOswaldo Ferreira2017-12-261-1/+1
|/
* Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'Grzegorz Bizon2017-12-263-0/+15
|\ | | | | | | | | | | | | Fix Error 500s with anonymous clones for a project that has moved Closes #41457 See merge request gitlab-org/gitlab-ce!16128
| * Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-movedStan Hu2017-12-252-12/+8
| |
| * Fix Error 500s with anonymous clones for a project that has movedStan Hu2017-12-253-3/+22
| | | | | | | | Closes #41457
* | Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2017-12-253-1/+11
|\ \ | |/ |/| | | | | | | | | Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123
| * Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-223-1/+11
| | | | | | | | | | | | | | There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442
* | Merge branch 'patch-28' into 'master'Dmitriy Zaporozhets2017-12-251-2/+1
|\ \ | | | | | | | | | | | | Update code_climate recommended usage. See merge request gitlab-org/gitlab-ce!16101
| * | Update code_climate recommended usage.Jonathan Duck2017-12-251-2/+1
|/ /
* | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-258-44/+162
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * | Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-227-20/+162
| | |
| * | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-223-24/+0
| | |
* | | Merge branch 'sh-handle-orphaned-deploy-keys' into 'master'Grzegorz Bizon2017-12-253-3/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle orphaned write deploy keys in /internal/post_receive Closes #41466 See merge request gitlab-org/gitlab-ce!16127
| * | | Gracefully handle orphaned write deploy keys in /internal/post_receivesh-handle-orphaned-deploy-keysStan Hu2017-12-243-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com, there are write deploy keys with no associated users. Pushes with these deploy keys end with an Error 500 since we attempt to look up redirect message. If there is no user, don't attempt to display a redirect message. Closes #41466
* | | | Merge branch 'sh-fix-helm-api-spec' into 'master'Grzegorz Bizon2017-12-251-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix namespace ambiguity with Kubernetes Pod definitions Closes #41458 See merge request gitlab-org/gitlab-ce!16130
| * | | Fix namespace ambiguity with Kubernetes Pod definitionssh-fix-helm-api-specStan Hu2017-12-241-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | This was causing a spec failure between Gitlab::Kubernetes::Helm::Pod and Gitlab::Kubernetes::Helm::Api::Pod if one spec loaded the former definition first. Closes #41458
* | | Merge branch '32364-updating-slack-notification-not-working-by-api' into ↵Rémy Coutable2017-12-234-100/+414
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Updating Slack Notification not working by API" Closes #32364 et #22306 See merge request gitlab-org/gitlab-ce!11435
| * | | Add Microsoft Teams Service API docsMark Fletcher2017-12-221-0/+34
| | | |
| * | | Add Prometheus Service API docsMark Fletcher2017-12-221-0/+34
| | | |
| * | | Add Bugzilla Service API docsMark Fletcher2017-12-221-0/+38
| | | |
| * | | Update parameter formatting across Service API docsMark Fletcher2017-12-221-62/+102
| | | |
| * | | Support new chat notifications parameters in Services APIMark Fletcher2017-12-224-42/+210
| | | | | | | | | | | | | | | | | | | | + Add support for the new separate channel and events settings * Dry up chat notifications in the service properties definitions
* | | | Merge branch 'dz-add-sast' into 'master'Rémy Coutable2017-12-232-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove security checks from static analysis and add sast job See merge request gitlab-org/gitlab-ce!16113
| * | | | Remove security checks from static analysis and add sast jobDmitriy Zaporozhets2017-12-232-2/+8
| | | | |
* | | | | Merge branch '41359-lint-changelog-yaml-error-message-is-useless' into 'master'Rémy Coutable2017-12-231-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "lint-changelog-yaml error message is useless" Closes #41359 See merge request gitlab-org/gitlab-ce!16122
| * | | | Return exception messages in scripts/lint-changelog-yaml41359-lint-changelog-yaml-error-message-is-uselessblackst0ne2017-12-231-1/+3
| | |_|/ | |/| |
* | | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵Rémy Coutable2017-12-23371-799/+792
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
| * | | | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-22371-799/+792
| | | | |
* | | | | Merge branch 'sh-disable-dev-shm' into 'master'Rémy Coutable2017-12-232-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Disable /dev/shm in CI See merge request gitlab-org/gitlab-ce!16105
| * | | | Disable /dev/shm in CIsh-disable-dev-shmStan Hu2017-12-222-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Chrome source code (https://chromium.googlesource.com/chromium/src/base/+/master/base_switches.cc#120): The /dev/shm partition is too small in certain VM environments, causing Chrome to fail or crash (see http://crbug.com/715363). Use this flag to work-around this issue (a temporary directory will always be used to create anonymous shared memory files). Addresses gitlab-org/gitlab-ee#4252 but doesn't appear to cure it completely.
* | | | Merge branch 'docs/gpg-clarify' into 'master'Marcia Ramos2017-12-221-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about using the term GPG for all related implementations Closes #36970 See merge request gitlab-org/gitlab-ce!14887
| * | | | Add note about using the term GPG for all related implementationsdocs/gpg-clarifyAchilleas Pipinellis2017-12-221-1/+6
| |/ / / | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36970
* | | | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-227-37/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Closes #41406 See merge request gitlab-org/gitlab-ce!16111
| * | | | Improve performance of DiffDiscussion#truncated_diff_lines and ↵Douwe Maan2017-12-227-37/+14
| | | | | | | | | | | | | | | | | | | | DiffNote#diff_line by removing expensive diff position calculation and comparison
* | | | | Merge branch 'fj-revert-event-target-author-preloading' into 'master'Stan Hu2017-12-222-6/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 See merge request gitlab-org/gitlab-ce!16118
| * | | | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López2017-12-222-6/+1
| | | | | |
* | | | | | Merge branch ↵Kamil Trzciński2017-12-2239-327/+805
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41053-extend-cluster-applications-to-allow-install-to-prometheus' into 'master' Extend Cluster Applications to allow installation of Prometheus Closes #41053 See merge request gitlab-org/gitlab-ce!15895
| * | | | | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-2239-327/+805
|/ / / / / /
* | | | | | Merge branch 'docs-move-article-ldap' into 'master'🚄 Job van der Voort 🚀2017-12-228-278/+272
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: move article LDAP-CE to its topic-related folder See merge request gitlab-org/gitlab-ce!16094
View Lorry Controller Status