summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-204-44/+48
|
* Memoize only yaml loading methodPawel Chojnacki2017-06-161-2/+2
|
* move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-161-1/+1
|
* Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-1662-286/+872
|\ | | | | | | 28717-additional-metrics-review-branch
| * Add French translations for Cycle Analytics, Project, and Repository pages.Erwan GEORGET2017-06-151-0/+1
| |
| * Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-151-1/+0
| |\ | | | | | | | | | | | | Stop using deprecated `path` field on Gitaly messages See merge request !12112
| | * Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-141-1/+0
| | | | | | | | | | | | | | | This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included
| * | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
| |\ \ | | |/ | |/| | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777
| | * Implement diff viewersDouwe Maan2017-06-143-2/+111
| | |
| * | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-6/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139
| | * Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-6/+6
| | |
| * | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-143-3/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| | * Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
| | | | | | | | | | | | | | | This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
| | * Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
| | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#33106
| | * Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
| | |
| * | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-145-4/+104
| |\ \ | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578
| | * | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| | | |
| | * | Send new configuration options with job's payloadTomasz Maczukin2017-06-121-2/+9
| | | |
| | * | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-125-2/+106
| | |/
| * | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| | * | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-1/+1
| | | |
| | * | Allow to access pipelines even if they are disabled, but only present jobs ↵Kamil Trzcinski2017-06-131-0/+4
| | | | | | | | | | | | | | | | and commit statuses without giving ability to access them
| * | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-131-0/+33
| |/ / | | | | | | | | | 'timestamps_with_timezone'
| * | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-123-0/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| | * | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-091-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Display queries duration in performance bar queries modalRémy Coutable2017-06-092-42/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Store Sherlock::Query in Peek adapterRémy Coutable2017-06-092-0/+72
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-122-0/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add the ability to perform background migrations See merge request !11854
| | * | | Add the ability to perform background migrationsYorick Peterse2017-06-122-0/+31
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Background migrations can be used to perform long running data migrations without these blocking a deployment procedure. See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for more information.
| * | | Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
| | * | Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
| |\ \ | | |/ | |/| | | | | | | Only look up diff size limit flags once per request See merge request !12048
| | * Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
| | |
| * | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-1/+5
| |\ \ | | | | | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| | * | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-1/+5
| | |/ | | | | | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
| * | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| | * | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-081-0/+1
| | | | | | | | | | | | | | | | binary afer loading all data
| * | | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-072-1/+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 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-9/+13
| |\ \ | | | | | | | | | | | | | | | | Move diffable? method from Repository to Diff::File See merge request !11980
| | * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-22/+38
| | | |
| * | | Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern2017-06-083-27/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Use Diff::File blob methods from diff highlighter See merge request !11978
| | * | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-083-27/+36
| | |/ /
| * | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into ↵Douwe Maan2017-06-081-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958
| | * | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-071-1/+2
| | | | | | | | | | | | | | | | | | | | Fix #33383
| * | | | Merge branch ↵Douwe Maan2017-06-081-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920
| | * | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| | | | |
View Lorry Controller Status