summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '9-3-stable' into security-9-3James Edwards-Jones2017-07-193-28/+13
|\
| * Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'Rémy Coutable2017-07-101-2/+4
| | | | | | | | | | | | | | Disable Flipper memoizer in tests to avoid transient failures Closes #34278 See merge request !12656
| * Merge branch 'fix-atom-eslint' into 'master'Tim Zallmann2017-06-261-16/+7
| | | | | | | | | | Fix eslint import resolver in Atom v1.18.0 See merge request !12238
| * Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-231-12/+0
| | | | | | | | | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'" Closes #34134, #34106, and #34084 See merge request !12389
| * Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-231-0/+4
| | | | | | | | | | | | | | Add the Flipper::Middleware::Memoizer middleware Closes #33940 See merge request !12359
* | Fix tempfile uploads to the correct directoryBob Van Landuyt2017-06-261-1/+1
| |
* | Use uploads/system directory for personal snippetsJarka Kadlecova2017-06-261-1/+1
|/
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵Sean McGivern2017-06-201-0/+5
| | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263
* Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-191-1/+1
| | | | | Support a configurable Rails asset_host to allow for CDNs See merge request !12102
* Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-162-7/+209
| | | | | | | | | | | | | | | Missing translations for the project & repository pages. Closes #33420 See merge request !12052 Conflicts: app/assets/javascripts/locale/en/app.js app/assets/javascripts/locale/es/app.js app/views/projects/pipeline_schedules/_form.html.haml locale/en/gitlab.po locale/es/gitlab.po locale/gitlab.pot
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-154-0/+35
| | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
* Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-151-0/+12
| | | | | | | Add Bootsnap to all environments to reduce application startup time Closes #33081 See merge request !12034
* Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-151-1/+10
| | | | | Fall back to gzip when missing optional zopfli dependency See merge request !12068
* Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-151-0/+3
| | | | | Instrument MergeRequestDiff#load_commits See merge request !12162
* Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-081-2/+2
|\ | | | | | | | | Master security update See merge request !12025
| * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
* | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-081-9/+1
|\ \ | |/
| * Translate project & repository pagesBob Van Landuyt2017-06-071-9/+1
| |
* | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0712-13/+157
|\ \ | |/
| * Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-0/+5
| |
| * Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-072-2/+2
| |\ | | | | | | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383
| | * Implement ability to update deploy keysAlexander Randa2017-06-022-2/+2
| | |
| * | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-4/+4
| |\ \ | | | | | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| | * | Add prometheus text formatterPawel Chojnacki2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | + rename controler method to #index from #metrics + remove assertion from nullMetric
| | * | Use only ENV for metrics folder locationPawel Chojnacki2017-06-023-10/+4
| | | |
| | * | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-0/+6
| | | |
| * | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-072-1/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| | * | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-0/+5
| | | | |
| | * | | Support descriptions for snippetsJarka Kadlecova2017-05-312-1/+4
| | | | |
| * | | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-051-0/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
| | * | | | Fix keys seedDouwe Maan2017-06-021-10/+14
| | | | | |
| | * | | | Allow scheduling from after_commit hooksDouwe Maan2017-06-021-9/+27
| | | | | |
| | * | | | Forbid Sidekiq scheduling in transactionsYorick Peterse2017-06-021-0/+27
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scheduling jobs in transactions can lead to race conditions where a job runs before a transaction has been committed. The added initializer ensures the various Sidekiq scheduling methods raise an error when called inside a transaction. Fixes #27233
| * | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-051-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377
| | * | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-011-0/+2
| | | |_|/ | | |/| |
| * | | | Merge branch ↵Tim Zallmann2017-06-041-3/+11
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets' into 'master' Use zopfli for better asset compression and disable compression in CI Closes #32992 See merge request !11798
| | * | | utilize zopfli compression algorithm for frontend assetsMike Greiling2017-05-301-0/+2
| | | | |
| | * | | skip asset compression in CIMike Greiling2017-05-301-3/+9
| | | | |
| * | | | Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' ↵James Lopez2017-06-022-0/+71
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add translations for elapsed time in words Closes #32747 See merge request !11769
| | * | | | Add translations for elapsed time in words32747-translation-of-dates-for-cycle-analytics-is-incompleteRuben Davila2017-06-022-0/+71
| | | | | |
| * | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-022-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
| | * | | | | Add Integrations bundlekushalpandya2017-06-011-0/+1
| | | | | | |
| | * | | | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-1/+1
| | | | | | |
| * | | | | | Merge branch 'winh-karma-sourcemaps' into 'master'Filipa Lacerda2017-06-022-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use inline source maps for karma Closes #30996 See merge request !11815
| | * | | | | Use inline source maps for karma (!11815)winh-karma-sourcemapswinh2017-05-312-2/+2
| | | | | | |
* | | | | | | Address feedbackAlfredo Sumaran2017-06-071-0/+1
| | | | | | |
* | | | | | | Restore code to make explore groups workAlfredo Sumaran2017-06-071-0/+1
| | | | | | |
* | | | | | | Remove non existent bundleAlfredo Sumaran2017-06-061-1/+0
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-0231-111/+857
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-011-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add username parameter to gravatar URL Closes #24472 See merge request !11741
View Lorry Controller Status