summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-011-1/+1
| | | | | | | |
| * | | | | | | Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan2017-06-011-1/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update session cookie key name to be unique to instance in development Closes #31644 See merge request !11839
| | * | | | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-uniqueEric Eastwood2017-06-011-1/+7
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31644
| * | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-012-0/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve N+1 query issue with discussions Closes #33013 See merge request !11775
| | * | | | | Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan2017-05-312-0/+15
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-317-7/+144
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | | | Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-302-2/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly by default in GitLab 9.3 Closes gitaly#242 See merge request !11796
| | | * | | | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-302-2/+2
| | | | | | |
| | * | | | | Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable2017-05-301-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `ActiveRecord::Migrator` idempotent again in test environment Closes #33030 See merge request !11762
| | | * | | | Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensionsGrzegorz Bizon2017-05-291-1/+1
| | | | |/ / | | | |/| |
| | * | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-301-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
| | | * | | | Creates a mediator for pipeline details vue in order to mount several vue ↵Filipa Lacerda2017-05-261-3/+3
| | | | |_|/ | | | |/| | | | | | | | | | | | | | apps with the same data
| | * | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
| | | * | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+1
| | | | | |
View Lorry Controller Status