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/config
AgeCommit message (Collapse)Author
2016-07-22Skip repository storage path valitaions on test environmentAlejandro Rodríguez
Storage path are not created until `TestEnv.init`, so we must skip their validation on initialization.
2016-07-22Use Pathname to make the repository storage path validations more robustAlejandro Rodríguez
2016-07-21Avoid data-integrity issue when repository_downloads_path is incorrectlyDouglas Barbosa Alexandre
2016-07-21Update default path for repository_downloads_path in gitlab.yml.exampleDouglas Barbosa Alexandre
2016-07-21Merge branch '4142-show-inline-video' into 'master' Rémy Coutable
Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png) ----- ## 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] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [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 !5215
2016-07-21Don't allow `.ogg` as a valid video extensionRémy Coutable
`.ogg` is for music files. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-21Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
2016-07-21Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher
This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a.
2016-07-20Merge branch 'email-domain-blacklist' into 'master' Robert Speicher
Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
2016-07-20Merge branch '15343-build-settiings' into 'master' Rémy Coutable
Resolve "Move Build badges settings to Builds page (or Builds settings)" ## What does this MR do? Removes pipeline settings section from project settings & creates a new pipelines settings page Adds builds badge to pipelines settings page & removes badge page ## Are there points in the code the reviewer needs to double check? All Rails updates -> particularly `builds_controller.rb` and `routes` Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827) ## What are the relevant issue numbers? Closes #15343 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png) ![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png) See merge request !5244
2016-07-20Create PipelinesSettingsController for showing settings pageKamil Trzcinski
2016-07-20Merge branch 'rename-js-files' into 'master' Fatih Acet
Replace namespace-specific application.js files with namespace-bundle.js files. Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file. This is pretty much just for the sake of clarity. cc: @alfredo1 See merge request !5221
2016-07-20Update routesKamil Trzcinski
2016-07-20Log cron_jobs configuration instead of raising exceptionGabriel Mazetto
2016-07-20Fix the Sentry spam from CSP violations by disabling it.Connor Shea
2016-07-20Merge remote-tracking branch 'origin/master' into 15343-build-settiingsKamil Trzcinski
2016-07-20Move Pipelines settings under ↵Kamil Trzcinski
`gitlab.com/gitlab-org/gitlab-ce/pipelines/settings`
2016-07-19Fix help page paths to make sure shortcuts and the UI help page work.Connor Shea
Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
2016-07-19Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-19First support of videos in issues, MRs and notesEric Hayes
* Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
2016-07-19Merge branch 'manual-actions' into 'master' Rémy Coutable
Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
2016-07-19Remove builds settings from project settings; add builds settings route; add ↵Annabel Dunstone
new controller action; put badge stuff under builds settings controller action
2016-07-19Merge branch 'cs-gemojione-3' into 'master' Robert Speicher
Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada: This update has new emoji and more sensical categories. See merge request !5237
2016-07-19Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano
better conform to its behavior and newly introduced behavior.
2016-07-19Improve cron_jobs loading error messagesGabriel Mazetto
2016-07-18Minor policy refinements.Connor Shea
2016-07-18Document the CSP file.Connor Shea
2016-07-18Only enable CSP policies when relevant features are enabled.Connor Shea
Gravatar, Google Analytics, Piwik, Recaptcha, etc.
2016-07-18Remove background_jobs-specific headers.Connor Shea
2016-07-18Only report to Sentry when it's enabled.Connor Shea
2016-07-18Add Sidekiq-specific headers.Connor Shea
2016-07-18Add the CSP reporting URI of Sentry.Connor Shea
2016-07-18Update image policy to allow external images over HTTPS.Connor Shea
2016-07-18Remove unsafe eval directive from scripts.Connor Shea
2016-07-18Fix that which hath been broken. Except the sidekiq admin iframe.Connor Shea
2016-07-18Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea
This adds the 2016 emoji as well as support for using SVG images instead of PNGs. It also fixes a number of incorrectly categorized emoji and other minor issues. Upgrade Rake task for Gemojione 3.0.0 and generate sprites. Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16 For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/ Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
2016-07-18Improve manual actions code and add model, service and feature testsKamil Trzcinski
Manual actions are accessible from: - Pipelines - Builds - Environments - Deployments
2016-07-18Add implementation of manual actionsKamil Trzcinski
2016-07-15Replace namespace-specific application.js files with namespace-bundle.js files.Connor Shea
2016-07-15Merge branch '17341-firefox-u2f' into 'master' Robert Speicher
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
2016-07-14Load Javascript U2F library selectively.Timothy Andrew
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.
2016-07-12Merge branch 'remove-hound-config' into 'master' Stan Hu
Remove Hound CI and Teatro config ## What does this MR do? Since we moved to gitlab.com we don't use Hound CI and Teatro anymore. Instead we have rubocop. See merge request !5089
2016-07-12Merge branch 'update-health-check-gem' into 'master' Rémy Coutable
Update the health_check gem to the latest release ## What does this MR do? Update the health_check gem to the latest release, which allows us to drop some of our code for overwriting the email check ## 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 - [ ] 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) See merge request !5186
2016-07-11Update the help_page_path route to accept paths directly instead of using ↵Connor Shea
parameters.
2016-07-11Make "Get started with Builds" Help Page link work properlyconnorshea
This is probably a horrible way of fixing this issue, but it does work. I can’t find much information on linking this deeply with Rails routes. Resolves #14872.
2016-07-11Update the health_check gem to the latest releaseDJ Mountney
This allows us to drop our disable email config override
2016-07-11Merge branch 'master' into single-file-diffsSean McGivern
2016-07-11Support renames in diff_for_path actionsSean McGivern
2016-07-08Merge branch 'cs-cropper' into 'master' Fatih Acet
Split Cropper.js from the main JavaScript manifest. ## What does this MR do? Splits Cropper.js from the main JavaScript file. ## Are there points in the code the reviewer needs to double check? That the avatar uploader works. (It did in my testing) ## Why was this MR needed? Smaller JS payload. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - 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 !4978
2016-07-08Collapse large diffs by defaultSean McGivern
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.