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-05-14Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
# Conflicts: # config/initializers/1_settings.rb
2016-05-13Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan
Remove activerecord-deprecated_finders gem We don’t use any of the deprecated finders, so it should be safe to remove. See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information. Resolves #17015. See merge request !3981
2016-05-13Merge branch 'health-check-route'Douwe Maan
# Conflicts: # db/schema.rb
2016-05-11Remove activerecord-deprecated_finders gemConnor Shea
We don’t use any of the deprecated finders, so it should be safe to remove. Resolves #17015.
2016-05-11Removes jquery-scrollto-rails.Connor Shea
Instead the script is now included directly from the vendor directory. Resolves #17166.
2016-05-10Update Ace EditorAlfredo Sumaran
2016-05-10Add the health_check gem end expose the health_check routeDJ Mountney
2016-05-09Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
2016-05-09Remove the annotate gem and delete old annotationsJeroen van Baarsen
In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
2016-05-05Merge branch 'stanhu/gitlab-ce-bump-mailroom'Douwe Maan
2016-05-04Merge branch 'revert-devise-async' into 'master' Rémy Coutable
Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
2016-05-04Revert "Remove the Devise Async gem."Connor Shea
This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-02Added JWT controllerKamil Trzcinski
2016-05-01Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea
This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
2016-05-01Bump mail_room to 0.7.0 to fix stuck IDLE connectionsStan Hu
Closes #13357
2016-04-29Added authentication service for docker registryKamil Trzcinski
2016-04-28Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea
I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
2016-04-27Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets
Add letter_opener_web gem Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route. See merge request !3893
2016-04-26Remove the Devise Async gem.Connor Shea
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
2016-04-25Merge branch 'update-jquery-rails' into 'master' Robert Speicher
Upgrade jQuery Rails from 4.0.5 to 4.1.1 Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: - https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md - https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ - https://github.com/rails/jquery-ujs/releases See merge request !3642
2016-04-24Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.Luke Howell
2016-04-22Add letter_opener_web gemRobert Speicher
Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route.
2016-04-20Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher
License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
2016-04-18Update octokit gem to version 4.3.0Douglas Barbosa Alexandre
2016-04-18Update to licensee 8.0.0 and fix API specsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov
endpoint
2016-04-12Update spring and spring-commands-spinachRobert Speicher
Spring changelog: https://git.io/vVAUY
2016-04-11Upgrade jQuery Rails from 4.0.5 to 4.1.1connorshea
Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ https://github.com/rails/jquery-ujs/releases
2016-04-11Upgrade annotate from 2.6.10 to 2.7.0connorshea
Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
2016-04-09Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea
Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
2016-04-09Merge branch 'rs-update-rails' into 'master' Robert Speicher
Bump rails to 4.2.6 See merge request !3424
2016-04-09Merge branch 'redis-connection-pool' into 'master' Robert Speicher
Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
2016-04-07Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea
This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
2016-04-06Make redis an explicit Gemfile dependencyJacob Vosmaer
2016-04-05Bump rails to 4.2.6Robert Speicher
2016-04-04Cache Banzai projects/objects using RequestStoreYorick Peterse
This was originally suggested by @ayufan and modified to be a bit cleaner and use RequestStore instead of a regular Hash. By caching the output of the two methods involved the number of queries is reduced significantly. For example, for an issue with 200 notes (of which 100 reference a number of merge requests) this cuts down the amount of queries from around 6300 to around 3300.
2016-03-27Merge branch 'upgrade-brakeman' into 'master' Robert Speicher
Upgrade Brakeman from 3.1.4 to 3.2.1 Includes support for Rails 5, bug fixes, and various additional vulnerability checks. [See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES). Working towards #14286. See merge request !3397
2016-03-26Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea
Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
2016-03-25Upgrade Brakeman from 3.1.4 to 3.2.1connorshea
Includes support for Rails 5, bug fixes, and various additional vulnerability checks. See Changelog for more information (https://github.com/presidentbeef/brakeman/blob/master/CHANGES)
2016-03-21Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable
Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
2016-03-21Update Rubocop from 0.35.1 to 0.38.0.connorshea
Discussed in #14233. See [their releases](https://github.com/bbatsov/rubocop/releases) for more info. Changes: - Enable DisplayCopNames for lint output. - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`. - Enabling Rails cops changed to new syntax. - Remove StyleGuides and move Descriptions to comments. - Add missing cops. - Add TODOs for cops that should be enabled in the future. - Set TargetRubyVersion to 2.1.
2016-03-19Inline mailer CSS using premailer.Douwe Maan
# Conflicts: # Gemfile.lock
2016-03-18Show a notice for diffs that are too largeYorick Peterse
This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
2016-03-16Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro
2016-03-15Support Wiki with UTF-8 page nameHiroyuki Sato
2016-03-15Merge branch 'css-style-guide' into 'master' Jacob Schatz
CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
2016-03-15Revert "Merge branch 'avatar-cropping' into 'master' "Rémy Coutable
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
2016-03-15Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea
documentation for SCSS Style Guide. See !3069 for more information.
2016-03-14Bump Capybara gem to 2.6.2Stan Hu
2016-03-11Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.Patricio Cano