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-11-14Merge branch 'patch-12' into 'master' Sean McGivern
use single quote for consistency See merge request !7442
2016-11-13Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński
Resolve "Link from build page to its pipeline" ## What does this MR do? Adds references and links to a build's pipeline within both individual build pages and the build index. ## Are there points in the code the reviewer needs to double check? Nothing springs to mind ## Why was this MR needed? See #22307 ## Screenshots (if relevant) ![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png) ![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png) ## 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 #22307 See merge request !7082
2016-11-13Merge branch 'zj-update-ci' into 'master' Kamil Trzciński
Only run builds on master of CE or EE This should reduce builds run by projects still running all pipelines for CE See merge request !6869
2016-11-12Merge branch 'ux-guide-index' into 'master' Achilleas Pipinellis
Fix link to index.md UX guide in development README.md Fix wrong link to UX docs that introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7142 See merge request !7444
2016-11-12Fix link to index.md in development README.mdAchilleas Pipinellis
[ci skip]
2016-11-12use single quote for consistencyBen Bodenmiller
2016-11-12Merge branch '24202-header-ui-improvements' into 'master' Fatih Acet
Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## 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 #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
2016-11-12Merge branch 'new-note-worker-record-not-found-fix' into 'master' Sean McGivern
Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
2016-11-12Merge branch 'patch-8' into 'master' Sean McGivern
fix Super User spacing See merge request !7433
2016-11-12Merge branch 'patch-11' into 'master' Sean McGivern
update redis server details See merge request !7436
2016-11-12Also test on dev.gitlab [ci skip]Z.J. van de Weg
2016-11-12Only run builds on master of CE or EEZ.J. van de Weg
2016-11-12Remove hover state on location badge.Devesh Khandelwal
2016-11-12update redis server detailsBen Bodenmiller
2016-11-12fix Super User spacingBen Bodenmiller
2016-11-12Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira
- Also remove unnecessary param
2016-11-11Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu
Update 8.14-rc1 migrations to minimize downtime and deploy time ## What does this MR do? Modify 8.14-rc1 migrations and code to minimize downtime and deploy time ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? 8.14-rc1 migrations took too much time in staging, so we didn't want to take too much downtime in production ## Does this MR meet the acceptance criteria? - Tests - [x] 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 #24386 See merge request !7427
2016-11-11Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern
Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
2016-11-11Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez
See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
2016-11-11Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan
Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 ## What are the relevant issue numbers? Related to #23352 See merge request !7292
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-11Ensure labels are loaded on "show" methods of MRAlex Sanford
Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
2016-11-11Merge branch 'ux-guide-restructure' into 'master' Achilleas Pipinellis
UX guide restructure The goal of this MR was to update the current UI guide to more of an UX guide (starting to detail when to use certain controls and patterns), and add structure to help organize the information. This initial version of the UX guide also lays down the groundwork for principles and personality. This guide is currently documenting the existing design, and will continue to be updated as the design evolves. Some inspiration/references used: - https://medium.com/ge-design/ges-predix-design-system-8236d47b0891#.nkf0chj8r - http://uxcellence.com/2015/11/04/product-principles/ - https://blog.asana.com/2013/10/design-principles/ See merge request !7142
2016-11-11Update README.md to link to UX guideVictor Wu
2016-11-11Remove <br> and replace GFM blockquote with the Markdown generalAchilleas Pipinellis
[ci skip]
2016-11-11Rename README.md to index.mdAchilleas Pipinellis
2016-11-11Refactored Sidekiq Throttler and updated documentationPatricio Cano
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 '21764-build-page-title' into 'master' Fatih Acet
Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. **This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link.** ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) **BEFORE:** ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) **AFTER:** ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.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 [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 #21764 See merge request !6160
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 '22699-group-permssion-background-migration' into 'master' Yorick Peterse
Fix project records with invalid visibility_level values See merge request !7391
2016-11-11Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern
Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953
2016-11-11Merge branch 'milestone-project-require' into 'master' Sean McGivern
Require projects before creating milestone Closes #24101 See merge request !7301
2016-11-11Merge branch 'mrchrisw/fix-github-link' into 'master' Achilleas Pipinellis
Use GitLab.com link, remove GitHub link Fix dead link GitHub=>GitLab See merge request !7418
2016-11-11Use GitLab.com link, remove GitHub linkChris Wilson
2016-11-11Merge branch 'use-config-param' into 'master' Sean McGivern
Use config param in `Repository#update_ref!` See merge request !7395
2016-11-11remove unused class nameMike Greiling
2016-11-11add tests for build row templatesMike Greiling
2016-11-11only display link to pipeline in generic build index, not on pipeline showMike Greiling
2016-11-11update generic commit status to correspond with build status templateMike Greiling
2016-11-11add missing column header for pipeline builds viewMike Greiling
2016-11-11remove red color on API pipeline trigger designationMike Greiling
2016-11-11add CHANGELOG entry for !7082Mike Greiling
2016-11-11add pipeline column within builds indexMike Greiling
2016-11-11add link to build's pipeline within build page headerMike Greiling
2016-11-11[ci skip] Establish basic structure for ux_guide README.mdawhildy
Block out pages needed for ux_guide Add resources stub to ux_guide home Fill out principles and basics Add TOC to basics Move all of UI guide to new UX guide structure Add first level structure on ux-guide pages Add more details to buttons Add button images. Update link on development Renamed surfaces to templates. Add tooltip details Update typography and icons on Basics page Add images for color. First draft of voice and tone Delete findings page Refine pages. Fill out Surfaces pages Clean up layout on basics, surfaces, features. Add anchorlinks and counts to components Fill out components page Add item title and system info block Fill out Features page Switch tooltip placement image
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-11Darken more icons on hover and highlight search form also.Devesh Khandelwal
2016-11-11Remove additional padding on right-aligned items in MR widget.Didem Acet
Fixes #24369.