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
2017-06-08Merge branch 'master-security-update' into 'master'Regis Boudinot
Master security update See merge request !12025
2017-06-08Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran
2017-06-08Bring in security changes from the 9.2.5 releaseDJ Mountney
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
2017-06-07Translate project & repository pagesBob Van Landuyt
2017-06-07Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran
2017-06-07Sync email address from specified omniauth providerRobin Bobbitt
2017-06-07Address feedbackAlfredo Sumaran
2017-06-07Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable
Implement ability to update deploy keys Closes #3191 See merge request !10383
2017-06-07Restore code to make explore groups workAlfredo Sumaran
2017-06-07Merge branch 'instrument-infra' into 'master'Grzegorz Bizon
Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
2017-06-07Merge branch '12910-snippets-description' into 'master'Phil Hughes
Support descriptions for snippets Closes #31894 See merge request !11071
2017-06-07Support uploads for newly created personal snippetsJarka Kadlecova
2017-06-06Remove non existent bundleAlfredo Sumaran
2017-06-05Merge branch 'sidekiq-transaction' into 'master'Sean McGivern
Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
2017-06-05Merge branch '30469-convdev-index' into 'master'Sean McGivern
ConvDev Index Closes #30469 See merge request !11377
2017-06-04Merge branch ↵Tim Zallmann
'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
2017-06-02Add prometheus text formatterPawel Chojnacki
+ rename controler method to #index from #metrics + remove assertion from nullMetric
2017-06-02Use only ENV for metrics folder locationPawel Chojnacki
2017-06-02Split metrics from health controller into metrics controllerPawel Chojnacki
2017-06-02Fix keys seedDouwe Maan
2017-06-02Implement ability to update deploy keysAlexander Randa
2017-06-02Allow scheduling from after_commit hooksDouwe Maan
2017-06-02Forbid Sidekiq scheduling in transactionsYorick Peterse
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
2017-06-02Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' ↵James Lopez
into 'master' Add translations for elapsed time in words Closes #32747 See merge request !11769
2017-06-02Merge branch '31511-jira-settings' into 'master'Sean McGivern
Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
2017-06-02Add translations for elapsed time in wordsRuben Davila
2017-06-02Merge branch 'winh-karma-sourcemaps' into 'master'Filipa Lacerda
Use inline source maps for karma Closes #30996 See merge request !11815
2017-06-02Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-06-01Merge branch 'dm-gravatar-username' into 'master'Sean McGivern
Add username parameter to gravatar URL Closes #24472 See merge request !11741
2017-06-01Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski
2017-06-01Add username parameter to gravatar URLDouwe Maan
2017-06-01Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan
Update session cookie key name to be unique to instance in development Closes #31644 See merge request !11839
2017-06-01Update session cookie key name to be unique to instance in developmentEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31644
2017-06-01Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern
Resolve N+1 query issue with discussions Closes #33013 See merge request !11775
2017-06-01Add Integrations bundlekushalpandya
2017-06-01simplify test&save actions when setting a service integrationJarka Kadlecova
2017-05-31Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan
2017-05-31Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin
* upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
2017-05-31Use inline source maps for karma (!11815)winh
2017-05-31Use another scope to add the - prefix, feedback:Lin Jen-Shin
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
2017-05-31Support descriptions for snippetsJarka Kadlecova
2017-05-30utilize zopfli compression algorithm for frontend assetsMike Greiling
2017-05-30skip asset compression in CIMike Greiling
2017-05-30Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable
Enable Gitaly by default in GitLab 9.3 Closes gitaly#242 See merge request !11796
2017-05-30Enable Gitaly by default in GitLab 9.3Jacob Vosmaer
2017-05-30Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable
Make `ActiveRecord::Migrator` idempotent again in test environment Closes #33030 See merge request !11762
2017-05-30Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes
Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
2017-05-30Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable
31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
2017-05-2931616-add-uptime-of-gitlab-instance-in-admin-areajboltz88
2017-05-29Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan
Rework project authorizations and nested groups for better performance See merge request !10885