summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-0/+1
|
* Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-181-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not normalized emoji paths ## What does this MR do? It normalizes emoji names in `api` and `toggle_award` ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? User was able to store +1 and thumbsup to databse, causing UI inconsistency. ## What are the relevant issue numbers? Fixes #19104 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5060
| * Fix not normalized emoji pathsdixpac2016-07-141-0/+1
| | | | | | | | | | | | * There where path where +1 was stored as +1 not as thumbsup that was causing problems such as showing thumbsup icon 2 time. I fixed this to always normalize and store +1 as tumbsup
* | Merge branch 'mentioned-user-tooltip' into 'master' Douwe Maan2016-07-151-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display tooltip for mentioned users and groups ## What does this MR do? Display tooltip for mentioned users and groups in Markdown. ## Are there points in the code the reviewer needs to double check? I don't know. ## Why was this MR needed? No tooltips were displayed. ## What are the relevant issue numbers? fixes #17060 ## Screenshots ![user-tooltip](/uploads/501b7d1b2a5e6adcadefbc56b08422ec/user-tooltip.png) ![group-tooltip](/uploads/0152a452f9a1ed9fc86101b242f7e4c2/group-tooltip.png) See merge request !5261
| * | Display tooltip for mentioned users and groups (!5261)winniehell2016-07-141-0/+1
| | |
* | | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
| * | | Load Javascript U2F library selectively.Timothy Andrew2016-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* | | | Merge branch ↵Douwe Maan2016-07-151-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-mention-himself'
| * | | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-141-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add project name and namespace to filename on project export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19848 Export filename now includes project and namespace path - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5268
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵fix/project-export-filenameJames Lopez2016-07-151-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | fix/project-export-filename
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-151-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix/project-export-filename
| * | | | | | add project name and namespace to filename on project exportJames Lopez2016-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | added changelog
* | | | | | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-151-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentioned users on diff notes ## Summary `DiffNote`, and `LegacyDiffNote` returns empty array for `mentionable_attrs`, because `mentionable_attrs` is not inheritable by subclasses. The problem can be illustrated with this small sample: ```ruby module Mentionable extend ActiveSupport::Concern module ClassMethods def attr_mentionable(attr) mentionable_attrs << [attr.to_s] end def mentionable_attrs @mentionable_attrs ||= [] end end end class A include Mentionable attr_mentionable :foo end class B < A end A.mentionable_attrs => [["foo", {}]] B.mentionable_attrs => [] ``` Possible solution using `cattr_accessor`: ```ruby module Mentionable extend ActiveSupport::Concern module ClassMethods def attr_mentionable(attr) mentionable_attrs << [attr.to_s] end end included do cattr_accessor :mentionable_attrs, instance_accessor: false do [] end end end class A include Mentionable attr_mentionable :foo end class B < A end A.mentionable_attrs => [["foo"]] B.mentionable_attrs => [["foo"]] B.mentionable_attrs < [:bar] => [["foo"], ["bar"]] A.mentionable_attrs => [["foo"], ["bar"]] ``` `mentionable_attrs` is inheritable by subclasses. If a subclass changes the value then that would also change the value for parent class. Similarly if parent class changes the value then that would change the value of subclasses too. ## What are the relevant issue numbers? Fixes #19807 Fixes #18022 /cc @stanhu @DouweM @rspeicher See merge request !5243
| * | | | | | | Update CHANGELOGfix-mentioned-users-on-diff-notesDouglas Barbosa Alexandre2016-07-151-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-151-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOGfix-creating-group-with-space-in-group-pathDouglas Barbosa Alexandre2016-07-141-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | added changelogfix/ee-to-ce-importJames Lopez2016-07-141-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-151-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable PostgreSQL statement timeout during migrations Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely. See merge request !5263
| * | | | | | Disable PostgreSQL statement timeout during migrationsStan Hu2016-07-141-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely.
* | | | | | Merge branch 'fix/import-issues-last-updated' into 'master' Robert Speicher2016-07-151-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues last update timestamp not preserved after importing a project Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19689 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19792 (similar, but not the same) Now `updated_at` should be the time from the original project. See merge request !5253
| * | | | | updated changelogfix/import-issues-last-updatedJames Lopez2016-07-141-0/+1
| |/ / / /
* | | | | Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master' Fatih Acet2016-07-151-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed collapsed assignee tooltip to users name ## What does this MR do? - Changes the collapsed assignee tooltip the users name rather than the username - Updates the tooltip after updating the assignee ## What are the relevant issue numbers? Closes #19280, #19281 ## Screenshots (if relevant) ![Screen_Shot_2016-06-28_at_17.55.52](/uploads/e6ccc1703f59966c978e731a841aabdc/Screen_Shot_2016-06-28_at_17.55.52.png) See merge request !4976
| * | | | CHANGELOGissuable-sidebar-collapsed-tooltipPhil Hughes2016-07-131-0/+1
| | | | |
* | | | | Merge branch 'update-branch-names-in-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh branch cache after `git gc` As discussed in !5160, we should refresh the branch name list after expiring to make sure we are in a good state and that we do not affect view performance (as much). See merge request !5235
| * | | | | Refresh branch cache after `git gc`Stan Hu2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Possible workaround for #15392
* | | | | | Merge branch 'compare-dropdowns' into 'master' Jacob Schatz2016-07-151-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated compare dropdowns ## What does this MR do? Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns. ## What are the relevant issue numbers? Closes #18891 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png) See merge request !4895
| * | | | | Added tests for compare dropdownsPhil Hughes2016-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG
* | | | | | Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-141-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import_data being saved as a result of an invalid import_url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479 Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 See merge request !5206
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-131-1/+23
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | fix/persistent-import-data
| * | | | | | Update CHANGELOGJames Lopez2016-07-121-1/+1
| | | | | | |
| * | | | | | added changelogJames Lopez2016-07-121-0/+3
| | | | | | |
* | | | | | | Merge branch 'project-files-header-cursor' into 'master' Fatih Acet2016-07-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use default cursor for table header of project files ## What does this MR do? Use default cursor for table header of project files. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? The table header had a pointer cursor even though it was not clickable. ## What are the relevant issue numbers? fixes #19612 See merge request !5165
| * | | | | | | Use default cursor for table header of project files (!5165)winniehell2016-07-141-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' Fatih Acet2016-07-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added shortcut to focus filters ## What does this MR do? Adds shortcut `f` to focus filter inputs. ## Are there points in the code the reviewer needs to double check? Is this a valid implementation? Please check [this comment below](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4570#note_12359978)! ## Why was this MR needed? Keyboard ninja UX :crossed_swords: ## What are the relevant issue numbers? Closes #18120. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.34.56](/uploads/d4cfb6ec340c118f5227be3f16ffbed1/Screen_Shot_2016-06-09_at_18.34.56.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4763
| * | | | | | | Added shortcut to focus all search tags apart from the top nav searchLuke "Jared" Bennett2016-07-111-0/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Added docs for filter shortcut Moved CHANGELOG entry Added phils fixes Fixed search form submitting with empty input Added review fixes Readability and selector perf fix
* | | | | | | Fix duplicated entry in changelog [ci skip]Robert Schilling2016-07-141-3/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown rendering for label references Fixes #14424, #19753, #19760 See merge request !5224
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-131-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rails-4-2-7' into 'master' Robert Speicher2016-07-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails from 4.2.6 to 4.2.7. Primarily just bug fixes. See merge request !5236
| * | | | | | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
* | | | | | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* | | | | | Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually render old and new sections of parallel diff next to each other See merge request !5173
| * | | | | | Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-0/+1
| | | | | | |
* | | | | | | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-131-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown loading time preformance fix ## What does this MR do? Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object This MR aims to fix #17474 See merge request !5113
| * | | | | | | adds entry to changelogtiagonbotelho2016-07-121-0/+1
| | | | | | | |
* | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-131-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Add "Developers can Merge" (to protected branches) to the CHANGELOG.Timothy Andrew2016-07-131-1/+1
| | | | | | |
* | | | | | | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220