summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.5.0-rc5v9.5.0-rc5Jose Ivan Vargas2017-08-171-1/+1
|
* Merge branch 'help-page-spec-fix' into 'master'9-5-stable-prepare-rc5Rémy Coutable2017-08-171-1/+1
| | | | | | | Fix help page version image spec Closes #36592 See merge request !13605
* Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-167-5/+97
| | | | | | | | | | Cache Appearance instances in Redis Closes #36066 and #31698 See merge request !13433 # Conflicts: # db/schema.rb
* Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-1614-1/+141
| | | | | Cache the number of forks of a project See merge request !13535
* Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1651-173/+2042
| | | | | Use a separate table for storing push events See merge request !12463
* Merge branch 'dispatcher-race-condition-fix' into 'master'Tim Zallmann2017-08-168-14/+20
| | | | | Fix race condition with dispatcher.js See merge request !13377
* Merge branch 'icon-sidebar-expanded-margin' into 'master'Clement Ho2017-08-161-2/+4
| | | | | | | Fixes icon sidebar expanding causing a jump in padding Closes #36456 See merge request !13568
* Merge branch ↵Phil Hughes2017-08-161-0/+1
| | | | | | | | | '36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container' into 'master' Resolve "Images in issue descriptions no longer scale to the width of their container" Closes #36442 See merge request !13586
* Merge branch '36430-edit-milestone-link' into 'master'Grzegorz Bizon2017-08-163-4/+29
| | | | | | | Fix edit milestone path from group milestones list Closes #36430 See merge request !13581
* Merge branch 'safari-overscroll-sticky-fix' into 'master'Tim Zallmann2017-08-161-1/+1
| | | | | | | Fixes sticky class being removed when over-scrolling in Safari Closes #36457 See merge request !13556
* Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-165-16/+19
| | | | | | | Don't depend on `Rails` for Redis configuration file paths Closes #36514 See merge request !13575
* Merge branch '36465-duplicate-events' into 'master'Douwe Maan2017-08-165-2/+63
| | | | | | | | | | Don't create event in Merge Request Create Service Closes #36465 See merge request !13566 # Conflicts: # db/schema.rb
* Merge branch 'safari-fly-out-fix' into 'master'Tim Zallmann2017-08-167-575/+799
| | | | | | | | Fix the fly-out menu in the sidebar not displaying in Safari Closes #36441 See merge request !13445
* Merge branch 'doc-group-issues-filtered-search' into 'master'Achilleas Pipinellis2017-08-162-0/+8
| | | | | | | Add documentation for groups issue filtered search Closes #36377 See merge request !13572
* Merge branch '36405-fix-mysql-timestamp-columns' into 'master'Stan Hu2017-08-161-0/+30
| | | | | | | Make sure MySQL would not use CURRENT_TIMESTAMP as the default for timestamp columns Closes #36405 See merge request !13560
* Merge branch 'fix-autocomplete-group' into 'master'Phil Hughes2017-08-161-0/+10
| | | | | | | Fix username autocomplete group name with no avatar alignment Closes #36502 See merge request !13578
* Merge branch 'changes-dropdown-unclickable' into 'master'Clement Ho2017-08-163-3/+7
| | | | | | | Fixed changed files dropdown not being shown Closes #36479 See merge request !13554
* Merge branch '36134_confi_touch_up' into 'master'Jacob Schatz2017-08-161-2/+2
| | | | | Use border radius scss vars See merge request !13360
* Merge branch '36450_confi_polish' into 'master'Clement Ho2017-08-162-2/+2
| | | | | Change Confidential Message When Visible - UI Polish See merge request !13551
* Merge branch 'repo-fixes' into 'master'Fatih Acet2017-08-1635-437/+516
| | | | | Many Repo Fixes See merge request !13432
* Merge branch 'bpj-repo-editor-fixes' into 'master'Jacob Schatz2017-08-1619-114/+141
| | | | | Repo Editor Fixes See merge request !13468
* Merge branch 'issue_31790' into 'master'Douwe Maan2017-08-163-0/+17
| | | | | | | Fix API responses when dealing with txt files Closes #31790 See merge request !13474
* Merge branch 'fix-any-projects-array' into 'master'Douwe Maan2017-08-162-3/+11
| | | | | | | Allow usage of any_projects? with an Array Closes #3646 See merge request !13559
* Merge branch 'fix-typos' into 'master'Rémy Coutable2017-08-163-4/+4
| | | | | | | Fix minor typos in views Closes #36317 See merge request !13487
* Merge branch 'zj-add-two-more-project-templates' into 'master'Douwe Maan2017-08-167-4/+13
| | | | | Add two more project templates See merge request !13415
* Merge branch 'zj-patch-rails-template' into 'master'Douwe Maan2017-08-161-0/+0
| | | | | Update rails tempalte to not contain gitlab-test See merge request !13537
* Update VERSION to 9.5.0-rc4v9.5.0-rc4Simon Knox2017-08-161-1/+1
|
* Fixed schema date9-5-stable-prepare-rc3Jose Ivan Vargas2017-08-151-1/+1
|
* Merge branch 'fix-broadcast-messages-migration' into 'master'Douwe Maan2017-08-151-1/+13
| | | | | Remove invalid broadcast messages before migrating See merge request !13538
* Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-156-8/+80
| | | | | | | Better caching and indexing of broadcast messages Closes #31706 See merge request !13429
* Merge branch 'winh-gpg-status-spinners' into 'master'Phil Hughes2017-08-156-2/+79
| | | | | | | Display GPG status loading spinner only when Ajax request is made Closes #35699 See merge request !13526
* Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-157-4/+16
| | | | | Handle missing .gitmodules when getting submodule urls See merge request !13509
* Merge branch 'docs-jira' into 'master'Douwe Maan2017-08-152-2/+6
| | | | | JIRA docs update See merge request !13514
* Merge branch '36398-update-our-auto-deploy-docs-to-include-monitoring-docs' ↵Achilleas Pipinellis2017-08-153-1/+26
| | | | | | | | | into 'master' Add auto-monitoring docs to auto-deploy page Closes #36398 See merge request !13522
* Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-158-10/+78
| | | | | | | Use Prev/Next pagination for exploring projects Closes #27390 See merge request !13456
* Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-1525-524/+251
| | | | | | | Don't rename system when migrating from 9.x -> 9.4 Closes #35525 and #36148 See merge request !13228
* Revert "Merge branch 'appearances-caching-and-schema' into 'master'"Simon Knox2017-08-157-97/+5
| | | | | This reverts commit 9c11894a656603c59c03d8f35fbe8cdf7a1ad0c4, reversing changes made to eb03da693c57327df1426eb3057af252bfd299f6.
* Revert "Merge branch 'broadcast-messages-cache' into 'master'"Simon Knox2017-08-156-80/+8
| | | | | This reverts commit c19ea197c7195771ddd68fa298f72c28612cadd8, reversing changes made to 0887a2bd10c3d774299b5b779d0335ddcb5064de.
* Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-1512-92/+48
| | | | | Increase performance of the breakpoint size checker See merge request !13454
* Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-1515-116/+149
| | | | | Repo fixes part E See merge request !13472
* Merge branch '36166_confi_polish_one' into 'master'Clement Ho2017-08-153-20/+5
| | | | | | | fix confidential border issue as well as confidential styles leaking on new MR Closes gitlab-ee#3121 See merge request !13388
* Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into ↵Rémy Coutable2017-08-156-15/+69
| | | | | | | | | 'master' Improve Prometheus docs, include nginx ingress Closes #36236 See merge request !13438
* Merge branch ↵Clement Ho2017-08-1514-78/+83
| | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
* Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-156-8/+80
| | | | | | | Better caching and indexing of broadcast messages Closes #31706 See merge request !13429
* Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' ↵Douwe Maan2017-08-154-1/+23
| | | | | | | | | into 'master' Pending delete projects no longer return 500 error in Admins projects view Closes #35435 See merge request !13389
* Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-153-11/+85
| | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
* Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-151-0/+29
| | | | | | | Restore blob fixture for JavaScript tests Closes #36187 See merge request !13399
* Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master'Phil Hughes2017-08-151-0/+1
| | | | | | | Increase z-index of pipeline dropdown Closes #36325 See merge request !13507
* Merge branch ↵Tim Zallmann2017-08-151-0/+3
| | | | | | | | | '36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view' into 'master' Resolve "Project overview page doesn't load commit metadata for repo view" Closes #36133 See merge request !13362
* Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-157-6/+98
| | | | | | | Cache Appearance instances in Redis Closes #36066 and #31698 See merge request !13433