summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-102-2/+2
| | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change.
* Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' Filipa Lacerda2017-03-091-2/+1
|\ | | | | | | | | Update emojis to use harmony modules (import/export) See merge request !9784
| * Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modulesEric Eastwood2017-03-081-2/+1
| |
* | Merge branch 'storage-validation-improvement' into 'master' Sean McGivern2017-03-091-6/+10
|\ \ | | | | | | | | | | | | Improve storage validation after configuration structure update See merge request !9811
| * | Improve storage validation after configuration structure updatestorage-validation-improvementAlejandro Rodríguez2017-03-081-6/+10
| |/ | | | | | | | | | | | | | | | | | | Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions.
* | Merge branch 'move-u2f-bundle' into 'master' Alfredo Sumaran2017-03-092-1/+1
|\ \ | |/ |/| | | | | Move u2f javascript library to webpack config See merge request !9755
| * move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-072-1/+1
| |
* | Clear AR connections before starting SidekiqYorick Peterse2017-03-081-0/+6
| | | | | | | | | | | | | | This should ensure that connections obtained before starting Sidekiq are not leaked, leading to connection timeouts. Fixes gitlab-com/infrastructure#1139
* | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' Robert Speicher2017-03-071-9/+28
|\ \ | | | | | | | | | | | | | | | | | | Swallow collection errors in RspecProfiling Closes #29005 See merge request !9765
| * | Swallow collection errors in RspecProfilingNick Thomas2017-03-071-9/+28
| | |
* | | Merge branch ↵Sean McGivern2017-03-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages' into 'master' Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages" Closes #26732 See merge request !8731
| * \ \ Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-079-13/+22
| |\ \ \ | | | |/ | | |/| | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
| * | | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-061-0/+1
| | | |
* | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-0/+1
| | | |
* | | | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-073-11/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597
| * | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-033-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' James Lopez2017-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change project count limit from 10 to 100000 See merge request !9767
| * | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limitRegis Freyd2017-03-071-1/+1
| | | | | |
* | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-075-4/+53
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add specs for Doorkeeper resource_owner_authenticatorMarkus Koller2017-03-071-2/+2
| | | | | |
| * | | | | Implement OpenID Connect identity providerMarkus Koller2017-03-075-2/+51
| |/ / / /
* | | | | Merge remote-tracking branch ↵Douwe Maan2017-03-071-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 'origin/personal_access_token_api_and_impersonation_token'
| * | | | applies relevant changes to the code and code structureTiago Botelho2017-02-281-1/+1
| | | | |
| * | | | add admin panel for personal access tokensSimon Vocella2017-02-281-0/+5
| | | | |
* | | | | Improve pipeline triggers UIKamil Trzciński2017-03-071-1/+5
| | | | |
* | | | | Moved call of SystemHooksService from UpdateMergeRequestsWorker to ↵gpongelli2017-03-071-0/+1
| |_|_|/ |/| | | | | | | | | | | GitPushServic…
* | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-074-5/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
| * | | | Use native unicode emojisEric Eastwood2017-03-064-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
* | | | | Merge branch 'backport-ee-change-webpack-empty-states' into 'master' Jacob Schatz2017-03-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport change introduced in EE - alias for empty states SVGs See merge request !9683
| * | | | | Backport change introduced in EE - alias for empty states SVGsbackport-ee-change-webpack-empty-statesFilipa Lacerda2017-03-031-0/+1
| | |_|/ / | |/| | |
* | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-061-0/+1
| |/ / / |/| | |
* | | | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' Rémy Coutable2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Gitlab application config file Closes #24998 See merge request !9702
| * | | | Fix typo in Gitlab application config filemedied2017-03-041-1/+1
| |/ / /
* | | | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-062-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add storage class configuration option for Amazon S3 remote backups See merge request !9599
| * | | | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-282-0/+3
| | |/ / | |/| |
* | | | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-061-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor network graph bundle to ES module syntax See merge request !9696
| * | | | remove manually vendored raphael library in favor of node moduleMike Greiling2017-03-051-1/+0
| | | | |
* | | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' Kamil Trzciński2017-03-062-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make stuck builds detection more performant Closes #27523 See merge request !9025
| * | | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-032-5/+5
| | | | | |
| * | | | | Update default configuration of stuck_ci_builds_worker cron intervalTomasz Maczukin2017-03-012-2/+2
| | |/ / / | |/| | |
* | | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | + rename shared context
* | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵Pawel Chojnacki2017-03-062-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other
* | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-063-2/+12
| |_|_|/ |/| | |
* | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508
| * | | | Remove remnants of git annexPawel Chojnacki2017-03-031-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-063-1/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036
| * | | Execute metrics initializer earlieretag-notes-pollingAdam Niedzielski2017-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware.
| * | | Add middleware for ETag caching with RedisAdam Niedzielski2017-03-011-0/+4
| | | |
| * | | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-011-1/+3
| | |/ | |/|
* | | merge cropper library into profile_bundlecommons-chunk-pluginMike Greiling2017-03-031-1/+0
| | |
View Lorry Controller Status