summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-1/+1
|
* Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-281-4/+0
|\ | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * Small code tweaksDouwe Maan2017-04-271-4/+0
| |
* | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵Douwe Maan2017-04-271-5/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
| * improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-5/+4
| |
* | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-6/+17
|\ \ | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-8/+4
| | |
* | | Refactor MarkupHelperDouwe Maan2017-04-272-14/+2
| | |
* | | Cache the rendered README, but post-process on showToon Claes2017-04-272-4/+0
| | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed.
* | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-261-2/+2
| | |
* | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-9/+44
| | |
* | | Decrease Cyclomatic Complexity threshold to 16Maxim Rydkin2017-04-261-40/+30
| | |
* | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-261-0/+29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Change issues sentence to use natural sorting Closes #20378 See merge request !7110
| * | Change issues sentence to use natural sortingJeff Stubler2017-04-251-0/+29
| | |
* | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-251-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show correct size when MR diff overflows Closes #26560 See merge request !10827
| * | | Show correct size when MR diff overflowsSean McGivern2017-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
* | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-241-1/+1
|/ / /
* | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-241-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix commenting on an existing discussion on an unchanged line that is no longer in the diff Closes #31339 See merge request !10888
| * | | Fix commenting on an existing discussion on an unchanged line that is no ↵Douwe Maan2017-04-241-1/+8
| | |/ | |/| | | | | | | longer in the diff
* | | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow OAuth clients to push code Closes #30305 See merge request !10677
| * | | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We currently support fetching code with username = 'oauth2' and password = <access_token>. - Trying to _push_ code with the same credentials fails with an authentication error. - There's no reason this shouldn't be enabled, especially since we allow the OAuth client to create deploy keys with push access: https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
* | | | Merge branch 'email-handler-metrics' into 'master' Sean McGivern2017-04-245-5/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make handler metric params more explicit See merge request !10854
| * | | | Make handler metric params more explicitemail-handler-metricsSean McGivern2017-04-215-5/+17
| | | | |
* | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Make location of gitlab_workhorse_secret configurable See merge request !10357
| * | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file.
* | | | | Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On initial startup with no rows in the application_settings table, the metaprogramming call to `if enabled?` attempts to create a row. This triggers the HTML caching path, which attempts to store metrics. At this point, not all the methods in `Gitlab::Metrics` have been defined! Move `current_transaction` to be defined before running the metaprogramming, to avoid a confusing NoMethodError
* | | | Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-211-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding issue exporting a project Closes #31186 See merge request !10824
| * | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issueJames Lopez2017-04-201-1/+7
| | | | | | | | | | | | | | | | | | | | error
* | | | | Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-203-4/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add email receiver metrics See merge request !10814
| * | | | Store projects in metrics for email repliesSean McGivern2017-04-202-4/+4
| | | | |
| * | | | Add metrics events for incoming emailsSean McGivern2017-04-201-0/+4
| |/ / / | | | | | | | | | | | | | | | | This lets us track how many incoming emails a GitLab instance is processing, by email type (handler) and by project (where applicable).
* | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| | | |
* | | | Refactor changing files in web UIDouwe Maan2017-04-202-31/+34
|/ / /
* | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-192-0/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481
| * | | Remove unused user activities codeSean McGivern2017-04-141-65/+0
| | | |
| * | | Add a new Gitlab::UserActivities class to track user activitiesRémy Coutable2017-04-143-83/+34
| | | | | | | | | | | | | | | | | | | | | | | | This new class uses a Redis Hash instead of a Sorted Set. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Port 'Add user activities API' to CESean McGivern2017-04-143-0/+148
| | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
| * | | Add prometheus services to usage pingSean McGivern2017-04-141-0/+1
| | | |
| * | | Add edition to usage pingSean McGivern2017-04-141-5/+8
| | | |
| * | | Add Upload count to usage dataRobert Speicher2017-04-141-0/+1
| | | |
| * | | Used named parameter for refreshing usage dataStan Hu2017-04-141-4/+4
| | | |
| * | | Cache the last usage data to avoid unicorn timeoutsStan Hu2017-04-141-4/+4
| | | |
| * | | Port 'Add uuid to usage ping' to CESean McGivern2017-04-141-1/+4
| | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
| * | | Track Mattermost usageZ.J. van de Weg2017-04-141-1/+2
| | | |
| * | | Remove pushes count from usage ping payloadRuben Davila2017-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This query is constantly generating timeout errors on large installations and we don't have a simple solution for now and also we don't think having this counter is really critical.
| * | | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+57
| | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
* | | | Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' Robert Speicher2017-04-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve gitaly_address error message Closes gitaly#174 See merge request !10532
| * | | | Improve gitaly_address error messagefix/improve-gitaly-unsupported-address-errorAhmad Sherif2017-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Closes gitaly#174
* | | | | Improves support for long build traces:Filipa Lacerda2017-04-181-1/+1
| | | | |
View Lorry Controller Status