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
AgeCommit message (Collapse)Author
2016-08-21Adds search box to done list on issue boardsissue-boards-search-donePhil Hughes
Closes #21139
2016-08-19Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' ↵Jacob Schatz
into 'master' 17465 Fixed dropdown cursor key navigation ## What does this MR do? This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key. It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively. ## Are there points in the code the reviewer needs to double check? I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete. ## Why was this MR needed? The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item. ## What are the relevant issue numbers? Fixes #17465. Closes #20752. Closes #21014. **Contributes** to #20754. ## Screenshots (if relevant) ![17465.mp4](/uploads/1145abec226036abbaaa4aa46020f52b/17465.mp4) See merge request !4781
2016-08-19Merge branch 'mark-as-processable' into 'master' Robert Speicher
Make all future skipped builds as processable when retrying a build ## What does this MR do? Makes a builds that are marked as skipped when a pipeline is processed to be reprocessed by changing their's state to created. ## Why was this MR needed? Currently retry is broken. When you retry a build of pipeline it will succeed and be marked as succeeded, when the next stages should be triggered. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21066 See merge request !5879
2016-08-19Merge branch ↵Douwe Maan
'21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' Resolve "EmailsOnPushWorker incorrectly claims deleted a commit after a push" ## What does this MR do? Fix the comparison order in the emails on push worker, so regular pushes don't show a message about force pushing. ## Are there points in the code the reviewer needs to double check? Don't think so, it was just a typo: `after_sha` should map to the `source_branch` argument, because it's the head of the comparison. ## Why was this MR needed? To fix a regression! ## What are the relevant issue numbers? Closes #21010. ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] ~~[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 - [ ] 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 !5894
2016-08-19Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher
Fix bug where notes weren’t shown in discussion when the code had changed after creation See merge request !5908
2016-08-19Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher
Added text color to issues labels in issue board lists ## What does this MR do? Adds the text color for labels in the response. The frontend was already setup to handle this, just needed the data from the backend. See merge request !5898
2016-08-19Merge branch 'directory-names-containing-space' into 'master' Robert Speicher
Do not escape URI when extracting path ## What does this MR do? - remove escaping of URI parameters after they have already been unescaped in `ExtractsPath` - remove spec that is relying on that behavior ## Why was this MR needed? - spaces in directory names were escaped leading to 404 errors on repository files page ## What are the relevant issue numbers? fixes gitlab-com/support-forum#952, #21106 See merge request !5878
2016-08-19Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher
Show wall-clock time when showing pipeline ## What does this MR do? Show wall-clock time when showing pipeline instead of cumulative builds time. Closes #17007 See merge request !5734
2016-08-19Fix bug where notes weren’t shown in discussion when the code had changed ↵Douwe Maan
after creation
2016-08-19Merge branch 'issue-boards-mobile-improvements' into 'master' Jacob Schatz
Improvements to issue boards on mobile ## What does this MR do? - Removes the drag handles - Adds a delay before dragging can start otherwise you can't scroll the page See merge request !5897
2016-08-19Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan
Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
2016-08-19Merge branch 'ace-ventura' into 'master' Jacob Schatz
Ace ventura ## What does this MR do? Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor. Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB ## Are there points in the code the reviewer needs to double check? That this doesn't just completely break anything. ## Why was this MR needed? Ace is a big library, this allows us to only load it when necessary. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !4914
2016-08-19Merge branch '20895-inline-comments-for-first-commit' into 'master' Douwe Maan
Fix line commenting for the initial commit ## What does this MR do? Support line positions on the initial commit, where we can't compare because there's no parent commit. ## Are there points in the code the reviewer needs to double check? I chose to use the blank SHA to represent the initial commit, but it could as easily be the same SHA. I just thought this was clearer. ## Why was this MR needed? People couldn't add line comments to the initial commit! ## What are the relevant issue numbers? Closes #20895. ## Screenshots (if relevant) ![Comment_on_initial_commit](/uploads/1164448462ff55d133f3ff51c98044df/Comment_on_initial_commit.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (N/A, regression) - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A) - [x] API support added (N/A) - 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 !5900
2016-08-19review changesLuke Bennett
2016-08-19Now we already included it in spec_helper.rbLin Jen-Shin
2016-08-19Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
wall-clock-time-for-showing-pipeline * upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
2016-08-19Do not escape URI when extracting path (!5878)winniehell
2016-08-19Add failing test for gitlab-com/support-forum#952winniehell
2016-08-19Merge branch '21081-repository-merge-in-progress-merge-commit-sha-spec' into ↵Douwe Maan
'master' Add a spec testing a second side effect of `Repository#merge`. ## What are the relevant issue numbers? - Closes #21081 - Related to gitlab-org/gitlab-ee!671 - Related to gitlab-org/gitlab-ee#900 See merge request !5886
2016-08-19Merge branch 'label-tooltip-sidebar-collapsed' into 'master' Robert Speicher
Added tooltip to label value in collapsed sidebar ## What does this MR do? Adds a list of the issuables labels to a tooltip in the collapsed sidebar. Limited to 5 otherwise the list could get crazy long. Closes #19398 See merge request !5232
2016-08-19Merge branch 'branch-delete-tooltip' into 'master' Jacob Schatz
Destroy branch delete tooltip when row is removed ## What does this MR do? Destroys the tooltip when the branch row is deleted. ## What are the relevant issue numbers? Closes #19528 See merge request !5120
2016-08-19Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master' Robert Speicher
Improve pipeline fixtures in development environment ### What does this MR do? This MR adds further improvements to seeds for development environment: * fixes build artifacts fixtures * fixes build log fixtures * moves unsuccessful jobs to the last triggered stage See merge request !5838
2016-08-19Merge branch 'x-bit' into 'master' Robert Speicher
Drop +x bit from .js and .css files See merge request !5885
2016-08-19Merge branch 'issue-board-label-spacing' into 'master' Jacob Schatz
Increased vertical alignment of labels for issues in lists ## What does this MR do? Increases the vertical alignment between labels on issues in issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-08-19_at_16.05.31](/uploads/4edc0fa520d1a0bf692d42d5f99ce4d7/Screen_Shot_2016-08-19_at_16.05.31.png) See merge request !5902
2016-08-19Removed commented code :poop:Phil Hughes
2016-08-19Improvements to issue boards on mobilePhil Hughes
2016-08-19Fix line commenting for the initial commitSean McGivern
The initial commit doesn't have a parent, so explicitly pass the blank SHA and handle that when calculating the position.
2016-08-19Merge branch 'issue-boards-keyboard-shortcuts' into 'master' Jacob Schatz
Fixed keyboard shortcuts not working on issue boards ## What does this MR do? Fixes keyboard shortcuts not working on issue boards page. ## What are the relevant issue numbers? Closes #21071 See merge request !5890
2016-08-19Merge branch 'dz-test-required' into 'master' Robert Speicher
Add test requirement for new files [ci skip] See merge request !5813
2016-08-19Merge branch 'issue-boards-tooltip-hide' into 'master' Jacob Schatz
Issue boards tooltip hide ## What does this MR do? - Hides & disables tooltips when dragging issues or lists - Fixes bug where cursor wouldn't change when dragging. See merge request !5889
2016-08-19Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' Douwe Maan
Render coverage badge using latest successful pipeline ## What does this MR do? This MR make test coverage badge to report value for the latest successful pipeline, instead of the latest one, regardless the status. Latest pipeline is often running, which makes coverage report inaccurate. Latest pipeline can be also the failed one, which may mean that not all stages got processed, therefore coverage report can be inaccurate as well. This also improves coverage badge performance because it is not necessary to touch repository to get recent SHA on the branch. ## Why was this MR needed? See #21013 ## What are the relevant issue numbers? Closes #21013 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - 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 !5862
2016-08-19Move editor paths to helperSean McGivern
2016-08-19Merge branch 'pipelines-ui-updates' into 'master' Jacob Schatz
Pipelines ui updates #### What does this MR do? * Fixes hover color width on build list * Fixes alignment of status icon on commits page * Add play icon SVG #### Why was this MR needed? Small UI bugs with recent MRs ![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png) ![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png) ![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png) See merge request !5856
2016-08-19Merge branch 'cs-fix-image-size-in-blob' into 'master' Jacob Schatz
Fix small image previews in the file viewer. ## What does this MR do? Fixes image previews being smaller than they should be. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Images were hard to view in the files view because they were limited to 50% of the file viewer's width. ## What are the relevant issue numbers? Mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/20505#note_13670085 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-08_at_10.35.40_AM](/uploads/69d885d1c8bb6296f5ac61aab4a4bf91/Screen_Shot_2016-08-08_at_10.35.40_AM.png) After: ![Screen_Shot_2016-08-08_at_10.35.50_AM](/uploads/b78ed41a781228d9f170ed559a1fda25/Screen_Shot_2016-08-08_at_10.35.50_AM.png) cc: @rymai See merge request !5721
2016-08-19Fix cron job keyDouwe Maan
2016-08-19Merge branch 'issue-boards-nav' into 'master' Jacob Schatz
Add boards controller to issue nav item #### What does this MR do? Adds active state to top level nav Before: ![Screen_Shot_2016-08-18_at_7.56.56_PM](/uploads/c5db0e9e077f0970b6b7b7d8d7a08147/Screen_Shot_2016-08-18_at_7.56.56_PM.png) After: ![Screen_Shot_2016-08-18_at_7.56.10_PM](/uploads/6b46e6f093c02fb44e25cf6952638a5b/Screen_Shot_2016-08-18_at_7.56.10_PM.png) See merge request !5883
2016-08-19Merge branch 'mr-title' into 'master' Jacob Schatz
Add space under MR title ## What does this MR do? Adds space underneath MR title because right now it's impossible to tell where the title ends and the first header of the MR body begins. Before: ![Screen_Shot_2016-08-18_at_1.43.05_PM](/uploads/4e07892036b1d90217fdecbed31a9494/Screen_Shot_2016-08-18_at_1.43.05_PM.png) After: ![Screen_Shot_2016-08-18_at_1.42.22_PM](/uploads/1341d4d7c5bd0db21233f6ebb961bafc/Screen_Shot_2016-08-18_at_1.42.22_PM.png) Note: We need to change our template to have the md headers `####` instead of `##`. Once that's been done it will look like this: ![Screen_Shot_2016-08-18_at_1.46.46_PM](/uploads/e30d432551debc15ec210e76dfcd3451/Screen_Shot_2016-08-18_at_1.46.46_PM.png) See merge request !5875
2016-08-19Merge branch 'tag-edit-subnav' into 'master' Jacob Schatz
Fix layout of edit tags page #### What does this MR do? Fixes layout of edit tags page #### Why was this MR needed? Layout was broken #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-18_at_1.33.00_PM](/uploads/9e9e52bdc0743971d6e0996e2c2030a0/Screen_Shot_2016-08-18_at_1.33.00_PM.png) After: ![Screen_Shot_2016-08-18_at_1.32.08_PM](/uploads/0a4a93508f0c98cb0788a2c70ee33f4e/Screen_Shot_2016-08-18_at_1.32.08_PM.png) See merge request !5874
2016-08-19Increased vertical alignment of labels for issues in listsPhil Hughes
2016-08-19Merge branch '17932-move-to-project-dropdown' into 'master' Jacob Schatz
Move to project dropdown with infinite scroll for better performance ## What does this MR do? On the Move dropdown on the edit issue page we introduced infinite scrolling to just return a limited number of projects, 50 items. So if the user can move the issue to 50 or more items when scroll down on the list a new set of projects will be requested to the server. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See #17932 ## What are the relevant issue numbers? Closes #17932 ## 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)~~ - ~~[ ] 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 !5686
2016-08-19Merge branch 'cs-async-branch-dropdown' into 'master' Jacob Schatz
Load branch dropdowns asynchronously for cherry pick and revert dialogs ## Why was this MR needed and what does it do? Previously every commit page was loading every branch onto the page twice, once each for the Cherry Pick and Revert modal dialogs. Most of the time they're never used, so that's a bit of a waste. This loads them asynchronously by modifying the existing ref switcher code to also work for the branch selectors. This is better for performance. ## Are there points in the code the reviewer needs to double check? Make sure Cherry Picking and Reverting still work (from my tests they seem to be fine). ## What are the relevant issue numbers? Fixes #20108. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_4.35.21_PM](/uploads/6b76ea656fd00df52ab56df5309976dc/Screen_Shot_2016-08-01_at_4.35.21_PM.png) ![Screen_Shot_2016-08-01_at_4.35.52_PM](/uploads/d2699a4bfc4ad1a4d414429e7c50e60f/Screen_Shot_2016-08-01_at_4.35.52_PM.png) After: ![Screen_Shot_2016-08-01_at_4.32.49_PM](/uploads/5faa6494b10dd9ac5e8850763a0c4018/Screen_Shot_2016-08-01_at_4.32.49_PM.png) ![Screen_Shot_2016-08-01_at_4.32.56_PM](/uploads/87c490bb375244e7d72421fd55e13e3f/Screen_Shot_2016-08-01_at_4.32.56_PM.png) ![Screen_Shot_2016-08-01_at_4.33.02_PM](/uploads/59ae65c0afc39d8939a9f36431815854/Screen_Shot_2016-08-01_at_4.33.02_PM.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 - [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) cc: @iamphill @jschatz1 See merge request !5607
2016-08-19Fix JSON schema to issues in issue board listsDouglas Barbosa Alexandre
2016-08-19Changed file namePhil Hughes
Updated spec HAML
2016-08-19Changed tests to use JS testsPhil Hughes
2016-08-19Addressed feedbackPhil Hughes
2016-08-19Made logic simpler by moving away from underscorejsPhil Hughes
2016-08-19Added tooltip to label value in collapsed sidebarPhil Hughes
Closes #19398
2016-08-19Add play icon SVGAnnabel Dunstone
2016-08-19Have hover color of builds span full widthAnnabel Dunstone
2016-08-19Fix alignment of icon on commits pageAnnabel Dunstone