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-22Generate ESLint HTML report (!7374)winniehell
2016-11-22Merge branch 'ux-guide-update-mr-copy' into 'master' Achilleas Pipinellis
Add Approve and Remove approval to UX Guide terminology table Updating UX Guide page on terminology to include guidance on 'Approve' and 'Remove approval'. See merge request !7632
2016-11-22Merge branch 'patch-1' into 'master' Achilleas Pipinellis
fixed manage_large_binaries_with_git_lfs.md typo See merge request !7612
2016-11-22Merge branch 'patch-10' into 'master' Achilleas Pipinellis
add missing sudo skip-auto-migration ## What does this MR do? Fixes minor documentation issue where adding `skip-auto-migration` file does not work because `sudo` is not used. See merge request !7435
2016-11-22Merge branch 'patch-9' into 'master' Achilleas Pipinellis
Change docker backup command in readme See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? MR fixes wrong order of parameters in the command given for backing up gitlab in a docker container ## Moving docs to a new location? No See merge request !7468
2016-11-22Merge branch 'docs/pipelines-add-img' into 'master' Achilleas Pipinellis
Add example image to pipelines docs See merge request !7652
2016-11-22Add example image to pipelines docsAchilleas Pipinellis
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24767 [ci skip]
2016-11-22Merge branch 'object-state-models-docs' into 'master' Achilleas Pipinellis
Object state models docs Object state models docs for issues and merge requests. This is to start documenting object models, focused more on users and how they experience the product. See merge request !7544
2016-11-22Merge branch 'zj-slash-command-docs' into 'master' Achilleas Pipinellis
Docs on Mattermost commands Still needs some screenshots, depends on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7558 /cc @ayufan @SeanPackham See merge request !7567
2016-11-22Restructure steps for MM slash commands serviceAchilleas Pipinellis
[ci skip]
2016-11-22Merge branch 'preserve-second-parameter-new-note-worker' into 'master' Sean McGivern
Preserve optional second parameter in NewNoteWorker jobs Closes #24678 See merge request !7602
2016-11-22Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński
Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
2016-11-22Add Changelog entry for CI linter validation fixGrzegorz Bizon
2016-11-22Fix entry lookup in CI config inheritance rulesGrzegorz Bizon
2016-11-22Extend specs for global ci configuration entryGrzegorz Bizon
2016-11-22Merge branch 'remove-require-from-services' into 'master' Robert Speicher
Remove unnecessary require_relative calls from service classes. See merge request !7601
2016-11-22Merge branch 'add-node-modules-cache-to-npm-related-builds' into 'master' Robert Speicher
Add node_modules cache to npm related builds See merge request !7548
2016-11-22Remove unnecessary require_relative calls from service classesSemyon Pupkov
Rails by default use autoload for all dirs from app folder. require_relative not needed. See ActiveSupport::Dependencies.autoload_paths
2016-11-22Merge branch '24730-broken-master' into 'master' Robert Speicher
Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
2016-11-22Merge branch 'backport-tt' into 'master' Jacob Schatz
Backport SmartInterval, PrettyTime, SubbableResource from EE. ## What does this MR do? Backports infrastructure used for EE-only Timetracking so it can be used and improved upon in CE. This doesn't really need review... it was already reviewed and merged in EE. There are no side effects or conflicts, just three new classes added: 1. `SubbableResource` -- pubsub for ajax resources 2. `SmartInterval`-- for configurable polling 3. `PrettyTime` -- time parsing and formatting utility methods - [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? https://gitlab.com/gitlab-org/gitlab-ee/issues/985 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 cc: @jschatz1 See merge request !7573
2016-11-22Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' ↵Jacob Schatz
into 'master' Restricted visibility buttons to checkboxes ## What does this MR do? Changes the `Restricted visibility levels` settings to use checkboxes instead of a button group. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-14_at_19.25.48](/uploads/0c6ee415ee0c89c0a7e3ffd98f88df71/Screen_Shot_2016-11-14_at_19.25.48.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 - [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 #18136 See merge request !7463
2016-11-22Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ↵Jacob Schatz
'master' Issues empty state ## What does this MR do? Adds the empty state for the project, dashboard and group issues. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Filtered to show no issues (on group issues page in this case but also dashboard and projects) ![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png) ### Project with no issues ![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png) ![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png) ### Group with no projects with any issues ![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.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 #20840 Closes #20850 See merge request !7309
2016-11-22Merge branch '23449-cycle-analytics-2-frontend' into 'master' Jacob Schatz
Cycle analytics second iteration frontend ## Are there points in the code the reviewer needs to double check? Mostly typos and code guidelines. ## Why was this MR needed? This implements the frontend part of !6859 for #23449 ## Screenshots **Initial view** ![Screen_Shot_2016-11-21_at_5.28.43_PM](/uploads/ff9cfa9c9d6c2da28c24e03e384f89af/Screen_Shot_2016-11-21_at_5.28.43_PM.png) **Cycle Analytics with data** ![Screen_Shot_2016-11-21_at_2.09.24_PM](/uploads/18d9786c090bdd554cf786c879543302/Screen_Shot_2016-11-21_at_2.09.24_PM.png) **User doesn't have access for a stage** ![Screen_Shot_2016-11-21_at_2.11.01_PM](/uploads/d1ea76a63f2de2224954b5f40038c488/Screen_Shot_2016-11-21_at_2.11.01_PM.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 - [ ] 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) - [ ] 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 #23449 See merge request !7366
2016-11-22Merge branch 'yury-n/gitlab-ce-18852-milestone-pages-mobile' into 'master' Jacob Schatz
Make milestone page responsive Credit to @yury-n for this one. :star: :star2: :star: Original MR: !5255 ## What does this MR do? > Makes the milestone page more mobile friendly ## Are there points in the code the reviewer needs to double check? > Shouldn't be but maybe double check that the views I changed are exclusively used by the milestone details page I was amending and not any other pages that I haven't tested after my changes. Looks good to me. :) Would be awesome to have @annabeldunstone check up on the stylesheet updates. ## Why was this MR needed? > Buttons were misaligned > Progress bar was not 100% width > Stats were cut in the middle > Milestone name/date text overflow ![Screen_Shot_2016-07-14_at_5.37.49_PM](/uploads/4da67c9f81d71873188e4a5cafed8113/Screen_Shot_2016-07-14_at_5.37.49_PM.png) ![Screen_Shot_2016-07-14_at_5.41.58_PM](/uploads/b3d767ce49e37b251c3192ed051400b8/Screen_Shot_2016-07-14_at_5.41.58_PM.png) ![Screen_Shot_2016-07-14_at_5.46.41_PM](/uploads/353ad59a88f3dea9e3f88e6ea05c1af3/Screen_Shot_2016-07-14_at_5.46.41_PM.png) ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_6.15.58_PM](/uploads/a26768701ea6cb00ccd85a5ac0772e36/Screen_Shot_2016-07-14_at_6.15.58_PM.png) ![Screen_Shot_2016-07-14_at_5.57.04_PM](/uploads/b94cf1b7593589948216342b48a19831/Screen_Shot_2016-07-14_at_5.57.04_PM.png) ## 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 you do - 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 #18852 See merge request !6655
2016-11-22Use single quote for stringsAlfredo Sumaran
2016-11-22Ue svg from SVGs objectAlfredo Sumaran
2016-11-22Merge branch 'fix-migration-paths' into 'master' Kamil Trzciński
Fix migration paths This fixes `migration paths` failure, preventing the `knapsack` from auto-balancing test suites: https://gitlab.com/gitlab-org/gitlab-ce/builds/6485942 cc @stanhu See merge request !7640
2016-11-22Dont trigger CI builds [ci skip]Kamil Trzcinski
2016-11-22Revert "Test only migrations"Kamil Trzcinski
This reverts commit 23fc7875a838b072b8869efada6f68a3a19fc9a6.
2016-11-22Add custom copy for each empty stageAlfredo Sumaran
2016-11-22Refactor Mattermost slash commands docsAchilleas Pipinellis
[ci skip]
2016-11-22Fetch only one revisionKamil Trzcinski
2016-11-22Highlight nav item on hoverAlfredo Sumaran
2016-11-22Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński
Improve deploy message ## What does this MR do? Improves deploy message to make it more descriptive and useable then what is already offered by deploy command. ## 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? See merge request !7629
2016-11-22Test only migrationsKamil Trzcinski
2016-11-22Fix migration paths testsKamil Trzcinski
2016-11-22Scroll CA stage panel on mobileAnnabel Dunstone Gray
2016-11-22Merge branch 'zj-fix-time-ago-tooltip-chat-names' into 'master' Kamil Trzciński
Evalute time_ago method instead of printing it ![Screen_Shot_2016-11-21_at_21.00.34](/uploads/295ffa522865fe1865b0c0b552a49ebf/Screen_Shot_2016-11-21_at_21.00.34.png) See merge request !7634
2016-11-22fixed manage_large_binaries_with_git_lfs.md typoJán Dzurek
2016-11-22Fix CSS declarationAlfredo Sumaran
2016-11-22administer to administratorAlfredo Sumaran
2016-11-21Move SVGs to JS objects for easy reuseAlfredo Sumaran
2016-11-21[ci skip] Add Approve and Remove Approval to UX Guide terminology tableawhildy
2016-11-21Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern
Fix 500 error when group name ends with git Closes https://gitlab.com/gitlab-com/support-forum/issues/1298 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742 See merge request !7630
2016-11-21Improve deploy command messageKamil Trzcinski
2016-11-21Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable
Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
2016-11-21Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński
Send registry address with build payload ## What does this MR do? Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build. ## Are there points in the code the reviewer needs to double check? Change in `lib/ci/api/entities.rb`. ## Why was this MR needed? This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE. ## Screenshots (if relevant) ## 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) - [x] API support added - Tests - [x] 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? Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434 See merge request !7474
2016-11-21No enough data to Not enough dataAlfredo Sumaran
2016-11-21Keep the cookie name as beforeAlfredo Sumaran
This is to avoid prompting the same dialog for people who already dismissed the dialog.
2016-11-21Fix variable usageAlfredo Sumaran