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-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-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-15Replace namespace-specific application.js files with namespace-bundle.js files.Connor Shea
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-06-30Split Cropper.js from the main JavaScript manifest.Connor Shea
2016-06-23Add precompilation for relevant assets.Connor Shea
2016-06-10Replace raphael-rails with raphael.js so it can be split from the rest of ↵Connor Shea
the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently.
2016-06-02Attempt to fix the user page.Connor Shea
2016-06-02Remove d3 except for on pages where it's necessary.Connor Shea
2016-05-25New confirmation email :fire:Robert Speicher
2016-05-20Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen
Move generator templates to generator_templates/ See merge request !4217
2016-05-19Move generator templates to generator_templates/Yorick Peterse
Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
2016-05-17Syntax-highlight diffs in push emailsSean McGivern
Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
2016-05-10Fix a few places where autoloading would failRémy Coutable
- Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu
Attempts to address #13521, #14825 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-30Add more parameters to the filter_parameters config.Connor Shea
Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find.
2016-04-07Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer
2016-04-04Add Gitlab::Redis connection poolJacob Vosmaer
2016-03-19Inline mailer CSS using premailer.Douwe Maan
# Conflicts: # Gemfile.lock
2016-03-11Filter import_url params because they may contain auth information. Fixes #14199Josh Frye
2016-03-09Parse config/resque.yml in one place onlyJacob Vosmaer
2016-03-04Don't generate factories automaticallyRobert Speicher
2016-02-29Use dedicated relative_url.rb initializerArtem Sidorenko
in order to have it the same way like in omnibus
2016-02-19Merge branch 'rs-emoji' into 'master' Douwe Maan
Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
2016-02-18Use SCAN during 'rake cache:clear'Jacob Vosmaer
This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway.
2016-02-12Update Emoji asset pathRobert Speicher
Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
2016-02-10Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis
Add documentation on relative URL support closes #12773 See merge request !2770
2016-02-10Fix typos and grammarAchilleas Pipinellis
[ci skip]
2016-02-09Edit configuration files for relative URL supportAchilleas Pipinellis
[ci skip]
2016-02-09Filter out variables from production logsKamil Trzcinski
This prevents leakage of CI Secure Variables
2015-11-26Migrate mailers to ActiveJobValery Sizov
2015-10-08Use `methods: :any` in our rack-cors configurationRobert Speicher
This was added in rack-cors 0.4.0 and allows all types of CORS requests to the API.
2015-07-15Expire Rails cache entries after two weeksJacob Vosmaer
This should help prevent endless Redis growth.
2015-05-10Add otp_attempt to filtered parametersRobert Speicher
2015-03-10Allow smb:// links in Markdown text.Douwe Maan
2015-02-07Filter private_token and password_confirmation params from logs.Douwe Maan
Closes #1770.
2015-01-23use new hash syntaxFred Chasen
2015-01-23Split up line and use single qoutes to declare Cors settingsFred Chasen
2015-01-23Expose Link header in CORS Api callsFred Chasen
2015-01-01Append in place for strings and arraysCiro Santilli
2014-11-18Use new gitlab-shell v2.3.0Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-18Revert "gitlab shell works if multiple rubies installed"Dmitriy Zaporozhets
This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.
2014-11-18gitlab shell works if multiple rubies installedCiro Santilli
Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb.
2014-10-30Merge pull request #8122 from bbodenmiller/cleanup-time-zoneDmitriy Zaporozhets
cleanup time zone settings
2014-10-22Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-pathDmitriy Zaporozhets
Remove unneeded app/finders config.autoload path
2014-10-22cleanup time zone settingsBen Bodenmiller
time zone settings moved to gitlab.yml in https://github.com/gitlabhq/gitlabhq/pull/8015
2014-10-21Add timezone configuration to gitlab.ymlSullivan SENECHAL
2014-10-08Remove unneeded app/finders config.autoload pathCiro Santilli
Every directory under app/ is searched by default
2014-10-01Remove I18n.enforce_available_locales deprecation messageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15Move hook models in separate dirDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>