summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵10-4-stable-patch-2Fatih Acet2018-01-292-1/+6
| | | | | | | | '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects See merge request gitlab-org/gitlab-ce!16485
* Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-291-1/+1
| | | | | | | Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
* Merge branch ↵Douwe Maan2018-01-2911-8/+53
| | | | | | | | | '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master' Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
* Merge branch ↵Rémy Coutable2018-01-293-2/+30
| | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
* Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-292-20/+35
| | | | | | | Use has_table_privilege for TRIGGER on PostgreSQL Closes #38634 See merge request gitlab-org/gitlab-ce!16618
* Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-293-28/+111
| | | | | Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16531
* Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-292-0/+12
| | | | | | | Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
* Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
| | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
* Update VERSION to 10.4.1v10.4.1Robert Speicher2018-01-241-1/+1
|
* Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-247-32/+15
| | | [ci skip]
* Merge branch '10-4-stable-patch-1' into '10-4-stable'Luke Bennett2018-01-2480-191/+932
|\ | | | | | | | | Prepare 10.4.1 release See merge request gitlab-org/gitlab-ce!16629
| * Merge branch '42361-workaround' into 'master'10-4-stable-patch-1Robert Speicher2018-01-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb" Closes #42361 See merge request gitlab-org/gitlab-ce!16671 (cherry picked from commit a403011e4f7adae339a3a8584e22a75f4872c3c5) c0d7dd38 Workaround a recaptcha pop-up that cannot be tested
| * Resolve conflict for secret management on Auto-DevOpsMayra Cabrera2018-01-231-3/+0
| |
| * Merge branch 'vendor-10-4-auto-devops-template' into 'master'Marin Jankovski2018-01-231-0/+5
| | | | | | | | | | | | Vendor 10.4 Auto DevOps template See merge request gitlab-org/gitlab-ce!16639
| * Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-233-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583 (cherry picked from commit b472411efb238ae223f99ecda067fa22d25bf8bb) a1f7b2bc Do not render non triggered empty state for pending jobs 30cfcd5a Update tests 63b93664 Adds information for pending state 4b8004c7 Improve pending case test c414ab84 Improve copy for the pending state
| * Merge branch ↵Robert Speicher2018-01-234-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595 (cherry picked from commit 4bf2fded92e05420e6d103c8df63d6d83198a684) 94f31ccc fix issue in which projects which have forks cannot be changed from private to public 1eefc384 add CHANGELOG.md entry for !16595 003f140c ensure fork_source returns nil when project is the root fork, add tests 96862096 add test to can_change_visibility_level? method de4993d4 remove redundant forked? check 2c1d7c09 fix spacing and wrap method params in parens
| * fix failures for loading_icon.vueJacob Schatz2018-01-221-2/+0
| |
| * resolve repo_commit_section.vueJacob Schatz2018-01-221-39/+1
| |
| * resolve conflicts in loading_icon.vueJacob Schatz2018-01-221-4/+1
| |
| * resolves changes in app.vueJacob Schatz2018-01-221-57/+18
| |
| * Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-222-0/+90
| | | | | | | | | | | | | | | | Add confirm when navigating away from page Closes #42102 See merge request gitlab-org/gitlab-ce!16518
| * Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-2225-76/+211
| | | | | | | | | | | | WebIDE: Fix Commit bugs See merge request gitlab-org/gitlab-ce!16459
| * Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13
| | | | | | | | | | Add more info on how DAST works See merge request gitlab-org/gitlab-ce!16615
| * Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-223-1/+23
| | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2212-15/+15
| | | | | | | | | | | | | | Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
| * Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-226-14/+102
| | | | | | | | | | | | | | Fix filtering projects & groups on group pages Closes #40785 See merge request gitlab-org/gitlab-ce!16584
| * Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master'Achilleas Pipinellis2018-01-223-0/+15
| | | | | | | | | | Add docs for playing a CI pipeline schedule See merge request gitlab-org/gitlab-ce!16568
| * Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-223-11/+17
| | | | | | | | | | | | | | Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
| * Merge branch 'docs/runners-clear-cache' into 'master'Marcia Ramos2018-01-221-0/+22
| | | | | | | | | | | | | | Add cache clearing documentation Closes #41940 See merge request gitlab-org/gitlab-ce!16559
| * Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'Marcia Ramos2018-01-221-0/+6
| | | | | | | | | | Add release added and release backported to CE See merge request gitlab-org/gitlab-ce!16553
| * Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-225-2/+42
| | | | | | | | | | | | | | Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
| * Merge branch 'docs/refactor-k8s-cluster' into 'master'Marcia Ramos2018-01-222-45/+241
| | | | | | | | | | Improve Clusters documentation See merge request gitlab-org/gitlab-ce!16435
| * Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'Stan Hu2018-01-223-0/+79
| | | | | | | | | | | | | | Delete conflicting orphaned routes before validation Closes #39551 See merge request gitlab-org/gitlab-ce!16242
| * Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-224-3/+76
|/ | | | | | rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
* Update VERSION to 10.4.0v10.4.0Luke Bennett2018-01-221-1/+1
|
* Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22145-731/+164
| | | [ci skip]
* Update VERSION to 10.4.0-rc8v10.4.0-rc8Luke Bennett2018-01-191-1/+1
|
* Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'Marin Jankovski2018-01-1950-139/+361
|\ | | | | | | | | Prepare 10.4 RC8 release See merge request gitlab-org/gitlab-ce!16557
| * Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-193-3/+6
| | | | | | | | | | | | | | | | | | | | | | Reduce UPDATEs for background column type changes Closes #42158 See merge request gitlab-org/gitlab-ce!16551 (cherry picked from commit 792e9ed7fa46d236c01fb14c8ad7f9b4ea4dee59) 0054d383 Reduce UPDATEs for background column type changes
| * Fixes incorrect resolution for applications.vue file10-4-stable-prepare-rc8Mayra Cabrera2018-01-181-1/+1
| |
| * Fix incorrect conflict resolution for cluster JSEric Eastwood2018-01-181-0/+2
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/release/tasks/issues/45#note_55157005 Bad commit: https://gitlab.com/gitlab-org/gitlab-ee/commit/ce872e0168 What it should look like: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16506/diffs
| * Merge branch 'remove-ide-pref' into 'master'Tim Zallmann2018-01-182-29/+0
| | | | | | | | | | | | | | | | | | | | Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454 (cherry picked from commit e56bcf92774b19115f62b609163c44ba9d919e69) af79397f Remove IDE option from user preferences 18abb303 remove specs
| * Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'Marcia Ramos2018-01-182-0/+5
| | | | | | | | | | | | | | | | | | Add Git LFS status icon to docs See merge request gitlab-org/gitlab-ce!16555 (cherry picked from commit 0392b0a9d56f13016679515c840184c5cad98e8e) de2cb24f Add Git LFS status icon to docs
| * Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537 (cherry picked from commit 50a649530a53a04d2044f9e4c5502586a7ed0c59) b1261ad9 Fix Mermaid drawings not loading on some browsers
| * Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1839-105/+337
|/ | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789 (cherry picked from commit 7acabf7c5908940665e1a8c4e3d09d423385657a) d0b8f536 Remove soft removals related code e5c49b57 Added tests for removing soft removed objects
* Update VERSION to 10.4.0-rc7v10.4.0-rc7Luke Bennett2018-01-181-1/+1
|
* Merge branch '10-4-stable-prepare-rc7' into '10-4-stable'Luke Bennett2018-01-1860-111/+1299
|\ | | | | | | | | Prepare 10.4 RC7 release See merge request gitlab-org/gitlab-ce!16519
| * Fix badly solved conflicts10-4-stable-prepare-rc7Filipa Lacerda2018-01-173-3/+4
| |
| * fixed eslintPhil Hughes2018-01-171-1/+1
| |
| * Merge branch '10-4-stable-prepare-rc7' of gitlab.com:gitlab-org/gitlab-ce ↵Phil Hughes2018-01-178-3/+30
| |\ | | | | | | | | | into 10-4-stable-prepare-rc7
View Lorry Controller Status