summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 'mrchrisw-22740-merge-api' into 'master' Sean McGivern2017-04-241-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix updating merge_when_build_succeeds via merge API endpoint Closes #22740 See merge request !10873
| * | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-241-3/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating a merge request via the `/merge` endpoint we check the `mergeable` and `mergeable_state` status, these will return `false` if the application option only_allow_merge_if_pipeline_succeeds is enabled. We should skip CI checks if the request uses the merge_when_pipeline_succeeds param Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22740
* | | | Merge branch 'db-backup-ssl-support' into 'master' Achilleas Pipinellis2017-04-241-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database SSL support for backup script. Closes #1440 See merge request !9715
| * | | | Database SSL support for backup script.Guillaume2017-04-051-5/+21
| | | | |
* | | | | 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.
* | | | | Start versioning cached markdown fieldsNick Thomas2017-04-211-14/+7
| | | | |
* | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-6/+1
| | | | |
* | | | | 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
* | | | | Remove a use of module_functionNick Thomas2017-04-211-12/+10
| |_|/ / |/| | |
* | | | 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 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786
| * | | | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-201-2/+5
| | | | | |
* | | | | | 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).
* | | | | Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not append issuable state to links with custom anchor Closes #30916 See merge request !10782
| * | | | | Do not append issuable state to links with custom anchorissuable-state-custom-linksAdam Niedzielski2017-04-191-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | Closes #30916 Change the presentation from [closed] to (closed)
* | | | | Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-201-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PlantUML integration in GFM Closes #30557 See merge request !10651
| * | | | | Fix PlantUML integration in GFMplantuml-filter-after-highlightAdam Niedzielski2017-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter.
* | | | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| | | | | |
* | | | | | Refactor changing files in web UIDouwe Maan2017-04-206-39/+42
| | | | | |
* | | | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-8/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509
| * | | | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-8/+14
| | | | | |
* | | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-191-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display issuable state only in notes and issuable description Closes #30964 See merge request !10789
| * | | | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #30964
* | | | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-197-1/+130
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481
| * | | | | Remove unused user activities codeSean McGivern2017-04-144-78/+1
| | | | | |
| * | | | | Expose `last_activity_on` in the User APIRémy Coutable2017-04-142-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | 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-146-1/+172
| | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
| * | | | | Remove user activities table and use redis instead of PG for recording ↵James Lopez2017-04-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activities Refactored specs and added a post deployment migration to remove the activity users table.
| * | | | | Add user activity service and spec. Also added relevant - NOT offline - ↵James Lopez2017-04-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
| * | | | | 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
View Lorry Controller Status