summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.2.4v9.2.4Regis2017-06-021-1/+1
|
* Update CHANGELOG.md for 9.2.4Regis2017-06-022-4/+4
| | | [ci skip]
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-0214-18/+210
| | | | | Fix visibility when referencing snippets See merge request !2101
* Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-023-2/+13
| | | | | Move the uploads in the correct folder when moving project/namespace See merge request !2112
* Update VERSION to 9.2.3v9.2.3Regis2017-05-311-1/+1
|
* Update CHANGELOG.md for 9.2.3Regis2017-05-315-16/+7
| | | [ci skip]
* Fix incorrect merge in 2c6fc0f.Timothy Andrew2017-05-311-0/+1
| | | | Reference: 3c7c859c359bf5d3955dd300d6861ff33af21ca7
* Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into ↵Douwe Maan2017-05-3133-30/+916
| | | | | | | | | | | | | 'security-9-2' (security-9-2) Upload files into `public/upload/system` instead of `public/upload` See merge request !2104 Conflicts: app/validators/dynamic_path_validator.rb Fixed conflicts based on 3c7c859c359bf5d3955dd300d6861ff33af21ca7
* Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-312-0/+5
| | | | | Restrict API X-Frame-Options to same origin See merge request !2103
* Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-313-11/+25
| | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100
* Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'Timothy Andrew2017-05-313-2/+45
| | | | | Escapes html content before appending it to the DOM See merge request !2107
* Revert "Merge branch 'issue-title-fade-fix' into '9-2-stable'"Timothy Andrew2017-05-301-1/+1
| | | | | This reverts commit 821daf709f522b386dcd347bd339dd9d948233fe, reversing changes made to cbde95c281af5cdd6b4dee3bdb1bdb360eb71d2c.
* Merge branch 'issue-title-fade-fix' into '9-2-stable'Filipa Lacerda2017-05-261-1/+1
|\ | | | | | | | | Fix issue realtime title/description change CSS transition See merge request !11731
| * Replace nextTick with setTimeoutPhil Hughes2017-05-261-1/+1
|/ | | | | | This was causing a weird bug in Safari where the CSS class wasn't applied yet the nextTick timeout was called meaning the CSS transition didn't happen Closes #32932
* Update VERSION to 9.2.2v9.2.2Regis2017-05-251-1/+1
|
* Update CHANGELOG.md for 9.2.2Regis2017-05-253-8/+5
| | | [ci skip]
* Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-255-1/+26
| | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434
* Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-2516-434/+635
| | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
* Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-253-5/+13
| | | | | | | 32715 Make all notes use equal padding Closes #32715 and #32467 See merge request !11616
* Merge branch '32828-refresh-build' into 'master'Phil Hughes2017-05-251-1/+1
| | | | | | | Use refresh icon for retried jobs Closes #32828 See merge request !11667
* Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-245-32/+37
| | | | | | | Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
* Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-243-89/+91
| | | | | Prevent errors from non-functional notify_post_receive endpoint See merge request !11509
* Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-249-1/+104
| | | | | | | Fix pipeline etag Closes #32658 See merge request !11615
* Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-241-0/+4
| | | | | | | Fix right-sidebar gap on mobile Closes #32735 See merge request !11625
* Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-242-10/+10
| | | | | | | Change order of if blocks to determine widget state properly. Closes #32550 See merge request !11668
* Update VERSION to 9.2.1v9.2.1Clement Ho2017-05-231-1/+1
|
* Update CHANGELOG.md for 9.2.1Clement Ho2017-05-233-8/+5
| | | [ci skip]
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-2312-28/+27
| | | | | Load improvements related to MR widget See merge request !11518
* Merge branch 'fix/gb/remove-ci-models-from-eager-load-paths' into 'master' Rémy Coutable2017-05-231-1/+0
| | | | | | | Remove CI/CD models directory from `eager_load_paths` Closes #31841 See merge request !11129
* Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-232-11/+23
| | | | | | | | Add missing regex to backup manager Closes #32669 See merge request !11635
* Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' ↵Fatih Acet2017-05-231-3/+2
| | | | | | | | | into 'master' Resolve "Follow-up from "Add "SHA mismatch" state to the MR widget"" Closes #32480 See merge request !11466
* Merge branch '32496-admin-tabs' into 'master'Phil Hughes2017-05-231-35/+36
| | | | | | | Fix admin tabs Closes #32496 See merge request !11514
* Merge branch 'fix-retried-for-postgres' into 'master'Kushal Pandya2017-05-234-7/+13
| | | | | | | Fix migrations for older PostgreSQL versions Closes #32721 See merge request !11620
* Fix cherry pick docClement Ho2017-05-221-12/+0
|
* Merge branch 'docs/new-topic-issues' into 'master'Sean Packham (GitLab)2017-05-2234-40/+182
| | | | | | | | New doc topic: issues Closes #27650 See merge request !11075
* Merge branch 'auto-update-docs' into 'master'Clement Ho2017-05-220-0/+0
| | | | | | Auto update docs See merge request !11552
* Merge branch 'docs/artifacts-preview' into 'master'Sean Packham (GitLab)2017-05-221-0/+4
| | | | | Add note about artifacts previewing in docs See merge request !11539
* Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' ↵Achilleas Pipinellis2017-05-221-1/+7
| | | | | | | | | into 'master' Add docs for change of Cache/Artifact restore order" Closes #32604 See merge request !11545
* Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-223-4/+8
| | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567
* Merge branch 'docs/deploys-perf-dashboard' into 'master'Sean Packham (GitLab)2017-05-224-12/+49
| | | | | Move environment monitoring to environments doc See merge request !11583
* Merge branch 'change_pipelines_schedules_help_page_path' into 'master'Rémy Coutable2017-05-222-3/+3
| | | | | Change pipelines schedules help page path See merge request !11592
* Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-222-4/+4
| | | | | | | 32486 Fix placement of note emoji on hover Closes #32486 See merge request !11605
* Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵Phil Hughes2017-05-221-2/+3
| | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609
* Merge branch 'docs/issues-multiple-assignees' into 'master'Sean Packham (GitLab)2017-05-224-0/+280
| | | | | | | | Add to docs: issues multiple assignees Closes gitlab-ee#2440 and #32574 See merge request !11556
* Merge branch 'docs/add-comment-snippets' into 'master'Sean Packham (GitLab)2017-05-222-0/+10
| | | | | | | Adds "comments on snippets" to doc Closes #32575 See merge request !11563
* Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
| | | | | | | MR widget styling fixes Closes #32657 See merge request !11591
* Merge branch 'mr-11396-conflicts' into '9-2-stable'Yorick Peterse2017-05-220-0/+0
|\ | | | | | | | | Fix conflicts for !11396 while picking in 9.2 stable See merge request !11529
* \ Merge branch 'mr-11396-conflicts' into '9-2-stable'Yorick Peterse2017-05-222-14/+25
|\ \ | |/ | | | | | | Fix conflicts for !11396 while picking in 9.2 stable See merge request !11529
| * Resolve migration helper conflictsmr-11396-conflictsBob Van Landuyt2017-05-222-23/+6
| | | | | | | | From `master`
| * [ci skip] Conflicts while picking !11396 into 9-2-stableYorick Peterse2017-05-222-0/+28
| |