summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2017-12-253-1/+11
|\ \ | |/ |/|
| * Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-223-1/+11
* | Merge branch 'patch-28' into 'master'Dmitriy Zaporozhets2017-12-251-2/+1
|\ \
| * | 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 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_receivesh-handle-orphaned-deploy-keysStan Hu2017-12-243-3/+21
* | | | Merge branch 'sh-fix-helm-api-spec' into 'master'Grzegorz Bizon2017-12-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix namespace ambiguity with Kubernetes Pod definitionssh-fix-helm-api-specStan Hu2017-12-241-1/+1
|/ / /
* | | Merge branch '32364-updating-slack-notification-not-working-by-api' into 'mas...Rémy Coutable2017-12-234-100/+414
|\ \ \
| * | | 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
* | | | Merge branch 'dz-add-sast' into 'master'Rémy Coutable2017-12-232-2/+8
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | 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 CIsh-disable-dev-shmStan Hu2017-12-222-0/+6
| |/ / /
* | | | Merge branch 'docs/gpg-clarify' into 'master'Marcia Ramos2017-12-221-1/+6
|\ \ \ \
| * | | | Add note about using the term GPG for all related implementationsdocs/gpg-clarifyAchilleas Pipinellis2017-12-221-1/+6
| |/ / /
* | | | 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_...Douwe Maan2017-12-227-37/+14
* | | | | 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/15788Francisco Javier López2017-12-222-6/+1
* | | | | | Merge branch '41053-extend-cluster-applications-to-allow-install-to-prometheu...Kamil Trzciński2017-12-2239-327/+805
|\ \ \ \ \ \
| * | | | | | 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 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 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 filesNick Thomas2017-12-227-202/+126
* | | | | | Merge branch 'rc/use-gitlab-styles' into 'master'Robert Speicher2017-12-2270-2531/+757
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use gitlab-stylesRémy Coutable2017-12-2270-2531/+757
|/ / / / /
* | | | | Merge branch 'index-namespaces-lower-name' into 'master'Yorick Peterse2017-12-224-1/+38
|\ \ \ \ \
| * | | | | 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 ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
* | | | | | Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'Achilleas Pipinellis2017-12-222-15/+8
|\ \ \ \ \ \
View Lorry Controller Status