summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | | | Docs: move article LDAP-CE to its topic-related folderMarcia Ramos2017-12-228-278/+272
| |/ / / /
* | | | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-225-9/+42
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Execute project hooks and services after commit when moving an issue Closes #41324 See merge request gitlab-org/gitlab-ce!16108
| * | | | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-225-9/+42
| |/ / /
* | | | Merge branch '38893-banzai-upload-filter-relative-urls' into 'master'Douwe Maan2017-12-227-202/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative URLs when linking to uploaded files Closes #38893 See merge request gitlab-org/gitlab-ce!15751
| * | | | Use relative URLs when linking to uploaded filesNick Thomas2017-12-227-202/+126
| | | | |
* | | | | Merge branch 'rc/use-gitlab-styles' into 'master'Robert Speicher2017-12-2270-2531/+757
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-styles which provides shared RuboCop config and cops Closes #37711 See merge request gitlab-org/gitlab-ce!14337
| * | | | Use gitlab-stylesRémy Coutable2017-12-2270-2531/+757
|/ / / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'index-namespaces-lower-name' into 'master'Yorick Peterse2017-12-224-1/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index on namespaces lower(name) for UsersController#exists Closes #41340 See merge request gitlab-org/gitlab-ce!16059
| * | | | Add index on namespaces lower(name) for UsersController#existsindex-namespaces-lower-nameGreg Stark2017-12-214-1/+38
| | | | |
* | | | | Merge branch 'dz-fix-seed-fu' into 'master'Douwe Maan2017-12-221-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibility Closes #41390 See merge request gitlab-org/gitlab-ce!16107
| * | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason Rails does not require it automatically when invoked via rake task which cause tasks like seed_fu fail Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'Achilleas Pipinellis2017-12-222-15/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify Auto DevOps pipelines See merge request gitlab-org/gitlab-ce!16106
| * | | | | Clarify Auto DevOps pipelinesFabio Busatto2017-12-222-15/+8
|/ / / / /
* | | | | Merge branch 'winh-fail-missing-export' into 'master'Tim Zallmann2017-12-222-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make webpack fail for missing exports See merge request gitlab-org/gitlab-ce!16005
| * | | | | Make webpack fail for missing exportsWinnie Hellmann2017-12-222-1/+4
| | | | | |
* | | | | | Merge branch 'lfs-docs-typo' into 'master'Achilleas Pipinellis2017-12-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix a typo in LFS documentation See merge request gitlab-org/gitlab-ce!16078
| * | | | | | docs: fix a typo in LFS documentationBen Boeckel2017-12-211-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2017-12-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix prometheus arg in prometheus.yml See merge request gitlab-org/gitlab-ce!16075
| * | | | | Fix prometheus arg in prometheus.ymlSam Galson2017-12-211-1/+1
| |/ / / /
* | | | | Merge branch 'jivl-general-icons-2' into 'master'Tim Zallmann2017-12-2226-36/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436
| * | | | | Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-1917-21/+41
| | | | | |
| * | | | | code-fork replacementsJose Ivan Vargas2017-12-192-6/+7
| | | | | |
| * | | | | Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-198-12/+25
| | | | | |
| * | | | | replaced download icon for the sprite based oneJose Ivan Vargas2017-12-197-11/+17
| | | | | |
* | | | | | Merge branch 'fl-update-svg' into 'master'Tim Zallmann2017-12-229-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Dependencies See merge request gitlab-org/gitlab-ce!16073
| * | | | | | Update DependenciesFilipa Lacerda2017-12-219-7/+11
| | |/ / / / | |/| | | |
View Lorry Controller Status