summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix deadlock on MySQL when updating MRsfix-deadlock-updating-mrsSean McGivern2017-08-182-5/+15
| | | | | | | | | | | | We haven't seen a deadlock on Postgres, but we do see a lock held for a long time. The problem is that the update to the row in `merge_requests` is part of the transaction that creates the pipeline, and so it's locked for all that time. This in turn means that commenting, or updating the MR's commits and diffs, will take longer, as they may have to wait for the pipeline service to complete. Making it a separate statement solves this problem as the update to the `merge_requests` table is fast.
* Merge branch '9-4-add-missing-i18n-guidelines' into '9-4-stable'Rémy Coutable2017-08-161-0/+5
|\ | | | | | | | | Add missing guidelines for i18n setup See merge request !13541
| * Add missing guidelines for i18n setup9-4-add-missing-i18n-guidelinesRubén Dávila2017-08-141-0/+5
|/
* Update VERSION to 9.4.5v9.4.5James Edwards-Jones2017-08-141-1/+1
|
* Update CHANGELOG.md for 9.4.5James Edwards-Jones2017-08-1419-73/+21
| | | [ci skip]
* Fix spec failures in 9-4-stable-patch-59-4-stable-patch-5James Edwards-Jones2017-08-113-4/+4
| | | | | | | Unable to find css "h1.project-title" in spec/features/profiles/account_spec.rb:46 Unable to find css "h1.project-title" in spec/features/profiles/account_spec.rb:53 Failure/Error: expect(recorded.count).to be_within(1).of(57) in spec/serializers/pipeline_serializer_spec.rb:113 Metrics/AbcSize: Assignment Branch Condition size is too high in app/controllers/admin/projects_controller.rb:5
* Merge branch 'fix-jenkins-error' into '9-4-stable-patch-5'James Edwards-Jones2017-08-112-3/+3
|\ | | | | | | | | Fix displaying specific error message when Jenkins test fails See merge request !13510
| * Fix displaying specific error message when Jenkins test failsfix-jenkins-errorJarka Kadlecova2017-08-112-3/+3
| |
* | Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into ↵Rémy Coutable2017-08-111-1/+1
| | | | | | | | | | | | | | | | | | 'master' Do not run the `ee_compat_check` job for stableish branches Closes #35131 See merge request !13497
* | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-114-27/+73
| | | | | | | | | | | | Fix conflicting redirect search See merge request !13357
* | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-113-3/+7
| | | | | | | | | | | | | | Render new issue link in failed job as a regular link instead of a UJS one Closes #36158 See merge request !13450
* | Merge branch '35342-re2-in-upgrade-docs' into 'master'Rémy Coutable2017-08-116-0/+53
| | | | | | | | | | Include RE2 in the upgrade docs See merge request !13448
* | Merge branch ↵Filipa Lacerda2017-08-117-4/+84
| | | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
* | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' ↵Douwe Maan2017-08-113-1/+17
| | | | | | | | | | | | | | | | | | | | into 'master' Pending delete projects no longer return 500 error in Admins projects view Closes #35435 See merge request !13389
* | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into ↵Sean McGivern2017-08-113-28/+81
| | | | | | | | | | | | | | | | | | | | 'master' Fix "Cannot connect to CI server error messages" Closes #34547 See merge request !13252
* | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-112-1/+5
| | | | | | | | | | | | Fix 404 on jobs details page See merge request !13459
* | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-113-0/+13
| | | | | | | | | | | | | | | | Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
* | Merge branch 'mk-validate-username-change-with-container-registry-tags' into ↵Robert Speicher2017-08-113-0/+23
| | | | | | | | | | | | | | | | | | | | 'master' Prevent user from changing username with container registry tags Closes #35451 See merge request !13356
* | Merge branch 'synchronous_zanata_community_contribution_translation' into ↵Rémy Coutable2017-08-115-251/+293
| | | | | | | | | | | | | | | | | | | | 'master' Synchronous zanata community contribution translation Closes #35003 See merge request !13242
* | Merge branch 'mk-fix-ldap-ca-file-docs' into 'master'Douwe Maan2017-08-112-2/+2
| | | | | | | | | | | | | | | | Fix LDAP documentation and example config Closes #35770 See merge request !13196
* | Merge branch 'project-foreign-keys-without-errors' into 'master'Stan Hu2017-08-112-8/+30
| | | | | | | | | | | | | | Change project FK migration to skip existing FKs Closes #35243 See merge request !13235
* | Merge branch '34492-firefox-job' into 'master'Phil Hughes2017-08-112-9/+14
| | | | | | | | | | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in firefox Closes #34492 See merge request !13203
* | Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-113-9/+28
| | | | | | | | | | Fix Mattermost integration See merge request !13305
* | Merge branch ↵Sean McGivern2017-08-113-1/+24
| | | | | | | | | | | | | | | | | | 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`" Closes #32790 See merge request !13286
* | Merge branch 'tc-fix-wildcard-protected-delete-merged' into 'master'Rémy Coutable2017-08-113-1/+13
| | | | | | | | | | | | | | Make Delete Merged Branches handle wildcard protected branches correctly Closes #35592 See merge request !13251
* | Merge branch 'fix-group-milestone-link-in-issuable-sidebar' into 'master'Robert Speicher2017-08-115-13/+62
| | | | | | | | | | Fix group milestone path on issuable sidebar See merge request !13199
* | Merge branch 'mk-fix-deploy-key-deletion' into 'master'Yorick Peterse2017-08-113-10/+49
| | | | | | | | | | | | | | Fix deletion of deploy keys linked to other projects Closes #35630 See merge request !13162
* | Merge branch '35232-next-unresolved' into 'master'Clement Ho2017-08-112-5/+9
| | | | | | | | | | | | | | fix Jump to next discussion Closes #35232 See merge request !13076
* | Merge branch 'assets-task-compile-langs' into 'master'Rubén Dávila2017-08-111-0/+1
| | | | | | | | | | | | | | Compile JS lang files before webpack compile Closes #35615 See merge request !13122
* | Merge branch 'search-flickering' into 'master'Filipa Lacerda2017-08-112-3/+7
| | | | | | | | | | | | | | Fixes the search losing focus Closes #35515 See merge request !13221
* | Merge branch '35697-allow-logged-in-user-to-read-user-list' into 'master'Rémy Coutable2017-08-113-18/+28
|/ | | | | | | Allow logged in users to read user list under public restriction Closes #35697 See merge request !13201
* Update VERSION to 9.4.4v9.4.4James Edwards-Jones2017-08-091-1/+1
|
* Update CHANGELOG.md for 9.4.4James Edwards-Jones2017-08-093-9/+5
| | | [ci skip]
* Merge branch 'fix/import-symbolink-links' into 'security-9-4'Rémy Coutable2017-08-083-1/+14
| | | | | Fix file disclosure via hidden symlinks using the project import See merge request !2154
* Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'James Edwards-Jones2017-08-083-0/+47
| | | | | Ensure user and hostnames begin with an alnum character in UrlBlocker See merge request !2138
* Update VERSION to 9.4.3v9.4.3Jose Ivan Vargas2017-07-311-1/+1
|
* Update CHANGELOG.md for 9.4.3Jose Ivan Vargas2017-07-318-29/+10
| | | [ci skip]
* Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'9-4-stable-patch-3Robert Speicher2017-07-314-3/+11
| | | | | Fix prometheus client pid reuse bug See merge request !13130
* Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵Douwe Maan2017-07-316-77/+110
| | | | | | | | | 'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080
* Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-317-53/+94
| | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150
* Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'Douwe Maan2017-07-312-1/+8
| | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165
* Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-312-1/+5
| | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185
* Merge branch 'fix-docs-re2-install' into 'master'Rémy Coutable2017-07-311-1/+1
| | | | | | | Add libre2-dev to the list of dependencies Closes #35342 See merge request !12996
* Merge branch '35482-dropdown' into 'master'Annabel Dunstone Gray2017-07-311-4/+4
| | | | | | | fix :focus styles for selected filter dropdown items Closes #35482 See merge request !13070
* Merge branch 'new-nav-issue-boards-height' into 'master'Annabel Dunstone Gray2017-07-311-1/+1
| | | | | | | Fix height of issue boards with new navigation Closes #35299 See merge request !12985
* Merge branch 'win-newnav-badges-firefox' into 'master'Phil Hughes2017-07-312-3/+3
| | | | | | | Fix badge positioning in new navigation for Firefox Closes #35634 See merge request !13186
* Merge branch '35672-edge-top-bar' into 'master'Phil Hughes2017-07-312-0/+5
| | | | | | | Fix top bar in jobs view for microsoft edge Closes #35672 See merge request !13175
* Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-312-0/+5
| | | | | | | Fixed the breadcrumb title for help pages Closes #35679 See merge request !13151
* Merge branch 'winh-issuable-sidebar-height' into 'master'Tim Zallmann2017-07-311-0/+4
| | | | | | | Make issuable searchbar full height Closes #35417 See merge request !13046
* Update VERSION to 9.4.2v9.4.2James Edwards-Jones2017-07-281-1/+1
|
View Lorry Controller Status