Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/assets
AgeCommit message (Collapse)Author
2016-11-11Merge branch 'vue2' into 'master' Fatih Acet
Migration to Vuejs version 2 List of required changes for our Vue usages - `init` :arrow_right: `beforeCreate` - `read` :arrow_right: `mounted` - `$els` :arrow_right: `$refs` - :no_entry_sign: `$remove` completely removed. :white_check_mark: Use `indexOf` and `splice` - :no_entry_sign: HTML embedding with `{{{ }}}` is deprecated. :white_check_mark: Use `v-html` See merge request !7254
2016-11-11Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray
19205 Redesign group page header to match new navigation ## What does this MR do? Redesigns group page to match comps ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-08_at_12.50.53_PM](/uploads/6c958e2ab05c1a73c9a96de25490ba2b/Screen_Shot_2016-11-08_at_12.50.53_PM.png) After: ![Screen_Shot_2016-11-08_at_12.50.34_PM](/uploads/822f81df8a0f82a4bdeee3739be5d1f7/Screen_Shot_2016-11-08_at_12.50.34_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #19205 See merge request !7363
2016-11-11Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into ↵Fatih Acet
'master' Account for fixed position MR when scrolling to elements ## What does this MR do? This MR accounts for the new merge request fixed affix bar when scrolling to an element on the MR page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The fixed MR tabs bar was not being taken into account when shifting permalink scroll targets so that they are unobscured by navigation elements. ## Screenshots (if relevant) Issues discussion permalink: ![Screen_Shot_2016-10-26_at_12.29.26_AM](/uploads/e278f784252f2b79c466f56b4f36d198/Screen_Shot_2016-10-26_at_12.29.26_AM.png) Merge request discussion permalink: ![Screen_Shot_2016-10-26_at_12.28.26_AM](/uploads/1e57357fffb815b217484f09377f3c23/Screen_Shot_2016-10-26_at_12.28.26_AM.png) Merge request diff permalink: ![Screen_Shot_2016-10-26_at_12.29.02_AM](/uploads/269f3a4a4075932355f665322387db86/Screen_Shot_2016-10-26_at_12.29.02_AM.png) Commit diff page permalinks work as well, but aren't highlighted currently (see: #23696) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23520 See merge request !7051
2016-11-11Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray
Remove additional padding on right-aligned items in MR widget. ## What does this MR do? Remove additional padding on right-aligned items in MR widget. So links look aligned. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because the links are not aligned. ## Screenshots (if relevant) ![Screen_Shot_2016-11-10_at_22.38.26](/uploads/a1deacb77483125df3c25c320f53b579/Screen_Shot_2016-11-10_at_22.38.26.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24369 See merge request !7411
2016-11-11Merge branch ↵Annabel Dunstone Gray
'24279-issue-merge-request-sidebar-todo-button-style-improvement' into 'master' Removed gray button styling from todo buttons in sidebars ## What does this MR do? Removes gray button styling from todo buttons in sidebars ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? gray buttons are inconsistent and look disabled ## Screenshots (if relevant) before: ![image](/uploads/98644ce1df8c903a2409fa066bca8195/image.png) after: ![image](/uploads/a2eb8a9c40c4e5cc081553647bde8235/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24279 See merge request !7387
2016-11-11Remove additional padding on right-aligned items in MR widget.Didem Acet
Fixes #24369.
2016-11-10removed gray button styling from todo buttons in sidebarsDimitrie Hoekstra
2016-11-10Fix alignment of status icons in commit message listAnnabel Dunstone Gray
2016-11-10Fixed tests for issue boards & diff note resolvingPhil Hughes
2016-11-10Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran
2016-11-10Changed how lists get sortedPhil Hughes
2016-11-10Issue board spec fixesPhil Hughes
2016-11-10Fixed jump to discussion button not showingPhil Hughes
2016-11-10Changed how resolving notes is renderedPhil Hughes
Vue2 was taking the template out & then appending again. This changes that
2016-11-10Remove unnecesarry require.Fatih Acet
2016-11-10Fixed up resolve discussionsPhil Hughes
2016-11-10Refactor of issue boards to work with Vue2Phil Hughes
2016-11-10VueJSMigration: Remove parallel-conflict-line component.Fatih Acet
It's because Vue says: "Component template should contain exactly one root element".
2016-11-10Vue migration fix syntax highlighting.Fatih Acet
2016-11-10Migrate Vue v1 to v2.Fatih Acet
2016-11-1019205 Redesign group page header to match new navigationtauriedavis
2016-11-10Account for merge request fixed affix barLuke Bennett
account for merge request fixed affix bar when adjusting scroll targets
2016-11-09Merge branch '22058-auto-selection' into 'master' Fatih Acet
Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly ## What does this MR do? In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed. This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out. ## Are there points in the code the reviewer needs to double check? At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem. ## Why was this MR needed? To solve #22058 and #23578 ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [X] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22058 and #23578 See merge request !7129
2016-11-09Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran
Remove an extra leading space from diff paste data ## What does this MR do? Remove an extra leading space from diff paste data. ## Are there points in the code the reviewer needs to double check? I have checked the following three patterns. * inline diff * parallel diff * blob preview ## Why was this MR needed? Diff paste data contain an extra leading space. So it need to remove an extra leading space manually from pasted diff data. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #14176 Closes #23899 See merge request !7133
2016-11-09Merge branch '24146-add-focus-state' into 'master' Annabel Dunstone Gray
24146 Add focus state to buttons and dropdowns ## What does this MR do? Adds focus state to buttons and dropdowns ## Are there points in the code the reviewer needs to double check? All focus states of buttons and dropdowns :) ## Why was this MR needed? Improve accessibility ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-07_at_4.30.31_PM](/uploads/8db2ac5e225c78495797180faf7bdb28/Screen_Shot_2016-11-07_at_4.30.31_PM.png) After: ![Screen_Shot_2016-11-07_at_4.30.16_PM](/uploads/4a81810cafe3063eef02b7bc87f8ce69/Screen_Shot_2016-11-07_at_4.30.16_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24146 See merge request !7347
2016-11-09Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet
Improved build page scroll UX ## What does this MR do? This MR smoothes the UX of the builds page by more effectively affixing the scroll step buttons. It also ensures the scroll step buttons are always in view, even if the sidemenu is open. It also moves the autoscroll button into the same container as the scroll buttons. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The build scroll buttons are always in unpredictable places and are often hidden behind sidemenus. ## Screenshots (if relevant) ![2016-09-08_17.43.58](/uploads/49cb9ad5ef2764453afaa405af7111b2/2016-09-08_17.43.58.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Contributes #21832 See merge request !6270
2016-11-08Merge branch 'upgrade-timeago' into 'master' Fatih Acet
Replace jQuery.timeago with timeago.js ## What does this MR do? Replaces jQuery.timeago with [timeago.js](https://github.com/hustcc/timeago.js) ## Are there points in the code the reviewer needs to double check? * Check to make sure its working everywhere :smile: * Check to make sure the timeago wording matches what we have now (I think I've got this down but an extra pair of :eyes: would help too) ## Why was this MR needed? * The jQuery.timeago version we have is outdated * timeago.js is smaller (7.19 KB => 4.52 KB) * timeago.js has no jQuery dependency * removes all inline javascript :crossed_swords: for timeago ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #21793 See merge request !6274
2016-11-0824146 Add focus state to buttons and dropdownstauriedavis
2016-11-08Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan
Use separate email-friendly token for incoming email See merge request !5914
2016-11-08Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern
into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
2016-11-07Replace jQuery.timeago with timeago.jsClement Ho
2016-11-0717492 Update link color for more accessible contrasttauriedavis
2016-11-07implements reset incoming email token on issues modal and account page,tiagonbotelho
reactivates all tests and writes more tests for it
2016-11-06Fixes #22058 and #23578Yann Gravrand
2016-11-06Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato
2016-11-05Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet
Update avatar container name so it doesnt conflict with other image containers Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular Before: ![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png) After: ![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png) cc @tauriedavis @dzaporozhets See merge request !7268
2016-11-04Merge branch 'add-matches-and-closest-element-extensions' into 'master' Fatih Acet
Added Element extension with .matches and .closest ## What does this MR do? This adds `.matches` and `.closest` polyfills that will help when removing/not using jQuery. I added these in another MR which was then refactored to not require these methods, but I thought we might as well not lose the code. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Help when removing/not using jQuery. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6946
2016-11-04Merge branch 'issue-board-new-label-new-list' into 'master' Fatih Acet
Creates new list from a new label ## What does this MR do? After creating a new label in the new list dropdown it automatically creates a new list. ## Screenshots (if relevant) ![new-label](/uploads/87940e364dc075ea8cc08d97bc1f1eff/new-label.gif) ## What are the relevant issue numbers? Closes #23026 See merge request !6744
2016-11-04Merge branch 'stylistic-changes-to-commit-title-bar' into 'master' Fatih Acet
Added various stylistic changes to commit title area ## What does this MR do? After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6994 was merged, there were some things left over. ## Are there points in the code the reviewer needs to double check? Yes, in general the code. Apart from that I couldn't get the extended commit sha to lign up correctly on smaller screens ## Why was this MR needed? Some things weren't done yet. - Commit description and commit sha are now bold like in the original design, and are also both visible on smaller screens - You can now extend the commit sha on bigger screens and keep it visible truncated on smaller screens. - options dropdown button now correctly displays on smaller screens (similar to issue/mr view) ## Screenshots (if relevant) Before: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png) After: ![image](/uploads/2329c9e2c731f0fc850b4864fb216756/image.png) ![image](/uploads/d8afde519fe276c0bce2286e56ea463b/image.png) not aligned correctly: ![image](/uploads/9006df59a1de3875b2317f14d3d20872/image.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? !6994 See merge request !7213
2016-11-04Add javascript unit tests for BuildJared Deckard
Move comments to the correct location Remove array extension usage Move build options to fixture to match view
2016-11-04Removed inline JS and added new affix declarationLuke Bennett
Tidied up UX Corrected naming convention issues with removing inline JS @deckar01 saves the day! Simplified `toggleSidebar` and `hideSidebar` Review changes Merge conflicts and update autoscroll button
2016-11-04Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern
Fix: Todos Filter Shows All Users Closes #22588 See merge request !7258
2016-11-04Update commit page stylesAnnabel Dunstone Gray
2016-11-04Update commit.scss to have correct lintingDimitrie Hoekstra
2016-11-04added various changes to commit title areaDimitrie Hoekstra
2016-11-04Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher
Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
2016-11-04Fix: Todos Filter Shows All UsersValery Sizov
2016-11-04Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master' Fatih Acet
Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24022 See merge request !7219
2016-11-04Creates new list from a new labelPhil Hughes
Closes #23026
2016-11-04Update commits.scssDimitrie Hoekstra
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 11:33:50 +0300