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-05-19Merge branch 'project-variables-ui' into 'master' Jacob Schatz
Project variables UI ![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png) ![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png) Closes #14091 See merge request !3942
2016-05-19Revert "Merge branch 'issues/15127' into 'master'"Stan Hu
This reverts merge request !3647
2016-05-19Merge branch 'issues/15127' into 'master' Stan Hu
fix #15127 ActiveJob::DeserializationError thrown `send_devise_notification` pre-maturely enqueued the task when the user instance has not yet been committed into the database, causing a record-not-found in the other sidekiq process. `devise-async` has already been taking care of asynchronous mail sending, we just need to run it inside queue `mailers` instead of `mailer` to enable it. The implementation of `devise-async` enqueues the task in `after_commit` hook which is the right way to do it. See merge request !3647
2016-05-18Merge branch 'master' into docker-registry-viewKamil Trzcinski
2016-05-17Fix rubocop offensesKamil Trzcinski
2016-05-17Instrument all Grape API helpersYorick Peterse
2016-05-17Bring back path to registry settingsKamil Trzcinski
2016-05-16Compact host and portKamil Trzcinski
2016-05-16Bring back port to registry configurationKamil Trzcinski
2016-05-16Use registry.port to construct the registry hostKamil Trzcinski
2016-05-16Bring back port to registry configurationKamil Trzcinski
2016-05-16Project variables UIPhil Hughes
Closes #14091
2016-05-14Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-14Simplify registry configurationKamil Trzcinski
2016-05-14Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-14Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
# Conflicts: # config/initializers/1_settings.rb
2016-05-13remove extra space to fix codestyleGabriel Mazetto
2016-05-13Codestyle: make sure we have space around operatorsGabriel Mazetto
2016-05-13Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher
Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
2016-05-13Merge branch 'health-check-route'Douwe Maan
# Conflicts: # db/schema.rb
2016-05-12Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-12Fix CI testsKamil Trzcinski
2016-05-12Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz
Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
2016-05-12Support token header for health check token, and general cleanup of the ↵DJ Mountney
health_check feature.
2016-05-12Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan
Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
2016-05-11Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-11Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen
issue_15572_snippets_tab_under_user_profile
2016-05-10Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski
2016-05-10Add health_check access token, and enforce on the health_check endpointDJ Mountney
Also added a health check page to the admin section for resetting the token.
2016-05-10Set the standard health_check options to include the cache check.DJ Mountney
2016-05-10Add the health_check gem end expose the health_check routeDJ Mountney
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-05-10Code improveLong Nguyen
2016-05-09Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-09Remove unused partsKamil Trzcinski
2016-05-09Rename `images` to `container_registry`Kamil Trzcinski
2016-05-09Revert "Eager load `lib/api`"Kamil Trzcinski
This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
2016-05-09Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
2016-05-09Send trace to a browser incrementally when build is runningKamil Trzcinski
We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
2016-05-09Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets
Remove `wall_enabled` field from Project See merge request !4089
2016-05-09Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings Without this setting your own trusted_proxies does not work. Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524 Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004 See merge request !3970
2016-05-09Enable the Rubocop DeprecatedClassMethods copConnor Shea
This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
2016-05-08WIPKamil Trzcinski
2016-05-08Remove `wall_enabled` field from ProjectRobert Speicher
2016-05-08Routing refactoringLong Nguyen
2016-05-08Fix routing errorLong Nguyen
2016-05-08user routings refactorLong Nguyen
2016-05-05Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen
issue_15572_snippets_tab_under_user_profile
2016-05-04Use the new admin settings for gravatarArtem Sidorenko