| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'redis_config_consistency' into 'master' | Valery Sizov | 2016-04-13 | 2 | -5/+3 |
| |\ | | | | | | | | | | | | | Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697 | ||||
| | * | Redis configuration consistencyredis_config_consistency | Valery Sizov | 2016-04-13 | 2 | -5/+3 |
| | | | |||||
| * | | Merge branch 'external-omniauth-providers' into 'master' | Marin Jankovski | 2016-04-13 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657 | ||||
| | * | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵ | Patricio Cano | 2016-04-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | external | ||||
| * | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' | Dmitriy Zaporozhets | 2016-04-13 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663 | ||||
| | * | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cron | Robert Speicher | 2016-04-12 | 1 | -0/+3 |
| | | |/ | |/| | | | | | | | Closes #15105 | ||||
| * | | | Adjust the default trusted_proxies to only include localhost, and allow ↵ | DJ Mountney | 2016-04-12 | 2 | -0/+3 |
| | | | | | | | | | | | | | other trusted proxies to be configured. | ||||
| * | | | Merge branch 'instrument-service-classes' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675 | ||||
| | * | | | Instrument all service classesinstrument-service-classes | Yorick Peterse | 2016-04-12 | 1 | -0/+12 |
| | |/ / | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15162 | ||||
| * | | | Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractor | Yorick Peterse | 2016-04-12 | 1 | -3/+0 |
| |/ / | | | | | | | | | | | Instrumenting this class together with Gitlab::ReferenceExtractor causes a StackError for some reason. Since Gitlab::ReferenceExtractor has most of the interesting code we'll only instrument that class. | ||||
| * | | Instrument Banzai code | Yorick Peterse | 2016-04-11 | 1 | -0/+23 |
| |/ | |||||
| * | Merge branch 'redis-connection-pool' into 'master' | Robert Speicher | 2016-04-08 | 2 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Add Gitlab::Redis connection pool | Jacob Vosmaer | 2016-04-04 | 2 | -3/+3 |
| | | | |||||
| * | | Instrument Rails cache codeinstrument-rails-cache | Yorick Peterse | 2016-04-08 | 1 | -0/+1 |
| | | | | | | | | | | | This allows us to track how much time of a transaction is spent in dealing with cached data. | ||||
| * | | Remove dumb debug statement and add many tests. | Jacob Schatz | 2016-04-07 | 1 | -1/+0 |
| | | | |||||
| * | | Add optional colon. | Jacob Schatz | 2016-04-07 | 1 | -1/+2 |
| | | | |||||
| * | | Premailer shouldn't remove script tags from our emails | Robert Speicher | 2016-04-05 | 1 | -1/+2 |
| |/ | | | | Closes #14943. | ||||
| * | Remove "Congratulations!" tweet button on newly-created project. | connorshea | 2016-03-31 | 1 | -1/+0 |
| | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857. | ||||
| * | Inline mailer CSS using premailer. | Douwe Maan | 2016-03-19 | 1 | -0/+7 |
| | | | | | | # Conflicts: # Gemfile.lock | ||||
| * | Support Wiki with UTF-8 page name | Hiroyuki Sato | 2016-03-16 | 1 | -0/+13 |
| | | |||||
| * | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" | Stan Hu | 2016-03-12 | 1 | -0/+1 |
| | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5 | ||||
| * | Revert "Merge branch 'support-go-subpackages' into 'master' " | Douwe Maan | 2016-03-12 | 1 | -1/+0 |
| | | | | This reverts merge request !3191 | ||||
| * | Merge branch 'support-go-subpackages' into 'master' | Douwe Maan | 2016-03-12 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191 | ||||
| | * | Support Golang subpackage fetchingsupport-go-subpackages | Stan Hu | 2016-03-12 | 1 | -0/+1 |
| | | | | | | | | | Closes #13805 | ||||
| * | | Merge branch 'rs-issue-12944' into 'master' | Douwe Maan | 2016-03-11 | 1 | -5/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828 | ||||
| | * | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944 | Robert Speicher | 2016-03-08 | 1 | -5/+5 |
| | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 | ||||
| * | | | Disable Rubocop for PostgreSQL patches | Yorick Peterse | 2016-03-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | This code is mostly a copy-paste from existing pull requests so there's no point in running Rubocop on it. | ||||
| * | | | Patch MySQL to ignore PostgreSQL schema options | Yorick Peterse | 2016-03-11 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | This ensures that options such as `using: :gin` and PostgreSQL operator classes are ignored when loading a schema into a MySQL database. | ||||
| * | | | Backport Rails support for PostgreSQL opclasses | Yorick Peterse | 2016-03-11 | 1 | -0/+186 |
| | |/ |/| | | | | | | | | | This is needed to support creating/dumping/loading indexes that use the gin_trgm_ops operator class on PostgreSQL. These changes are taken from Rails pull request https://github.com/rails/rails/pull/19090. | ||||
| * | | Parse config/resque.yml in one place only | Jacob Vosmaer | 2016-03-09 | 2 | -13/+9 |
| |/ | |||||
| * | Merge branch 'mail-room-config-without-rails' into 'master' | Douwe Maan | 2016-03-02 | 1 | -5/+1 |
| |\ | | | | | | | | | | | | | | | | | Don't load all of GitLab in mail_room Fixes #12731 cc @jacobvosmaer See merge request !3005 | ||||
| | * | Don't load all of GitLab in mail_room | Douwe Maan | 2016-02-26 | 1 | -5/+1 |
| | | | | | | | | | Fixes #12731 | ||||
| * | | Use dedicated relative_url.rb initializer | Artem Sidorenko | 2016-02-29 | 1 | -0/+10 |
| |/ | | | | in order to have it the same way like in omnibus | ||||
| * | Properly set `auto_link_saml_user` default value in the Settings loader. | Patricio Cano | 2016-02-22 | 1 | -0/+1 |
| | | |||||
| * | Add release tracking for Sentryrs-sentry-release-tracking | Robert Speicher | 2016-02-17 | 2 | -2/+3 |
| | | |||||
| * | Change default smpt port to 465 (default smtps port) | Artem V. Navrotskiy | 2016-02-09 | 1 | -1/+1 |
| | | |||||
| * | Instrument various Rugged constantsexpand-git-instrumentation | Yorick Peterse | 2016-02-01 | 1 | -0/+10 |
| | | |||||
| * | Instrument all Gitlab::Git instance methods | Yorick Peterse | 2016-02-01 | 1 | -2/+4 |
| | | |||||
| * | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filters | Robert Speicher | 2016-01-28 | 1 | -0/+6 |
| | | | | | This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33. | ||||
| * | Update ExternalIssue regex for JIRA integration | Blake Hitchcock | 2016-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used. | ||||
| * | monkey patch for mysql 5.7monkey_patch | Valery Sizov | 2016-01-25 | 1 | -0/+48 |
| | | |||||
| * | Instrument Gitlab::Git::Repository | Yorick Peterse | 2016-01-21 | 1 | -0/+1 |
| | | | | | | This adds instrumentation for the instance methods of Gitlab::Git::Repository. | ||||
| * | Use sentry in env production only | Jeroen Nijhof | 2016-01-20 | 1 | -9/+11 |
| | | |||||
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jeroen Nijhof | 2016-01-20 | 1 | -8/+14 |
| |\ | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb | ||||
| | * | Ensure Gravatar host looks like an actual hostfix-gravator-default-url | Rémy Coutable | 2016-01-18 | 1 | -8/+14 |
| | | | |||||
| * | | Add sentry integration | Jeroen Nijhof | 2016-01-18 | 1 | -0/+17 |
| |/ | |||||
| * | Added metrics instrumentation for all findersinstrument-finders | Yorick Peterse | 2016-01-18 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' | Douwe Maan | 2016-01-13 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383 | ||||
| | * | Use CGI.escape instead of URI.escape, because URI is obsoleted. | Jason Lee | 2016-01-12 | 1 | -1/+1 |
| | | | | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc | ||||
| * | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters" | Robert Speicher | 2016-01-12 | 1 | -6/+0 |
| |/ | | | | This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256. | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |