summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.5.0-rc6v9.5.0-rc6Jose Ivan Vargas2017-08-181-1/+1
|
* Merge branch '34533-speed-up-group-project-authorizations' into 'master'9-5-stable-prepare-RC6Douwe Maan2017-08-186-10/+88
| | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
* Merge branch ↵Grzegorz Bizon2017-08-182-1/+24
| | | | | | | | | '36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraint' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::NotNullViolation: ERROR: null value in column "a_mode" violates not-null constraint" Closes #36630 See merge request !13663
* Merge branch ↵Achilleas Pipinellis2017-08-181-0/+4
| | | | | | | | | 'docs/sm/36543-describe-supported-version-in-group_level_variables' into 'master' Describe the supported version of group-level variables API in document Closes #36543 See merge request !13648
* Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-184-5/+47
| | | | | | | Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction"" Closes #35072 See merge request !13631
* Merge branch 'tc-git-tower-pagination-links' into 'master'Grzegorz Bizon2017-08-183-10/+64
| | | | | | | API: do not set rel="next" pagination header when no records found Closes #36618 See merge request !13629
* Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'Clement Ho2017-08-181-1/+2
| | | | | | | Fixes the blown up emoji problem in notes Closes #36448 and #36282 See merge request !13632
* Merge branch 'issue_35580' into 'master'Rémy Coutable2017-08-184-24/+139
| | | | | | | Fix project import to group when there are project milestones Closes #35580 See merge request !13482
* Merge branch '36450_second_touch_up' into 'master'Clement Ho2017-08-182-2/+2
| | | | | Change 'This issue is not confidential' to 'Not confidential' See merge request !13607
* Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'Phil Hughes2017-08-181-0/+4
| | | | | | | Prevent horizontal scrolling in new sidebar when collapsed Closes #36608 and #36507 See merge request !13638
* Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-181-0/+1
| | | | | | | Remove horizontal scroll on collapsed sidebar Closes #36270 See merge request !13458
* Merge branch 'zj-fix-fe-posting-value' into 'master'Kamil Trzciński2017-08-184-3/+10
| | | | | | | Fix project templates and add docs Closes #36492 See merge request !13563
* Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'Tim Zallmann2017-08-181-1/+5
| | | | | Fixed collapsed sidebar not showing fly-out menu See merge request !13622
* Merge branch 'fix-milestone-sidebar' into 'master'Phil Hughes2017-08-182-2/+2
| | | | | | | Fix milestone sidebar collapse button Closes #36453 See merge request !13620
* Merge branch 'commits-list-page-limit' into 'master'Tim Zallmann2017-08-182-1/+6
| | | | | | | Fix commit list request appending 40 to offset Closes #36569 and #36563 See merge request !13603
* Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-1812-104/+160
| | | | | Only create commit GPG signature when necessary See merge request !13561
* 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