summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add milestone progress to APIRobert Schilling2019-02-132-4/+7
|
* Support `only: changes:` on MR pipelinesHiroyuki Sato2019-02-131-1/+1
|
* API: Expose text_color for project and group labelsRobert Schilling2019-02-121-1/+1
|
* Log queue duration in production_json.logStan Hu2019-02-121-0/+3
| | | | | | | | `queue_duration` is a useful metric that is currently in api_json.log but not in production_json.log. We should add it because it tells us how long the request sat in Workhorse before Unicorn processed it. Having this field enables the support team to better troubleshoot when delays began to happen.
* Merge branch ↵Grzegorz Bizon2019-02-121-2/+12
|\ | | | | | | | | | | | | '7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ce' into 'master' Usage ping for Group overview default user preference See merge request gitlab-org/gitlab-ce!24980
| * Protect group overview usage ping w/ feature flag7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ceVictor Zagorodny2019-02-121-2/+5
| | | | | | | | | | | | | | user_preferences key is includes into system usage data only if group_overview_security_dashboard feature flag is enabled; see https://gitlab.com/gitlab-org/gitlab-ee/issues/7048
| * Add user_preferences_usage to usage pingVictor Zagorodny2019-02-121-1/+8
| |
* | Merge branch '57223-wiki-finder' into 'master'Kamil Trzciński2019-02-121-3/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove BATCH_SIZE from WikiFileFinder Closes #57223 See merge request gitlab-org/gitlab-ce!24933
| * | Remove BATCH_SIZE from WikiFileFinder57223-wiki-finderJarka Košanová2019-02-061-3/+1
| | |
* | | Merge branch ↵Yorick Peterse2019-02-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '8798-geo-implement-selective-sync-support-for-the-various-fdw-queries' into 'master' Replace dots with an underscore when creating an alias for the recursive CTE See merge request gitlab-org/gitlab-ce!25112
| * | | Replace dots with an underscore when creating an alias for the CTEDouglas Barbosa Alexandre2019-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When the Arel table to use as the alias contains a schema in your name, e.g., "gitlab_secondary"."namespaces" it produces an invalid query.
* | | | Merge branch 'sh-import-source-branch-github-forks' into 'master'Yorick Peterse2019-02-122-2/+32
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Create the source branch for a GitHub import Closes #57370 See merge request gitlab-org/gitlab-ce!25064
| * | | Create the source branch for a GitHub importStan Hu2019-02-112-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the GitHub importer creates a merge request, it retrieves the SHA but does not actually create the source branch. This makes it impossible to merge an open merge request, particularly if the source branch were from a forked project. In that case, the branch will never exist because the original `project-name:source-branch` name is never created, nor is it a valid branch name. To prevent possible branch name conflicts, forked source branches are now renamed `github/fork/project-name/source-branch` and created when necessary. Note that we only create the source branch if the merge request is open. For projects that have many merge requests, the project would end up with a lot of possibly dead branches. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57370
* | | | Merge branch 'sh-terminate-pg-connections-on-setup' into 'master'Rémy Coutable2019-02-121-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kill all PostgreSQL connections for rake dev:setup Closes gitlab-development-kit#450 See merge request gitlab-org/gitlab-ce!24743
| * | | | Move terminate_all_connections into setup Rake taskStan Hu2019-02-112-23/+21
| | | | |
| * | | | Kill all PostgreSQL connections for rake dev:setupStan Hu2019-02-112-0/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are any clients connected to the DB, PostgreSQL won't let you drop the database. It's possible that Sidekiq, Unicorn, or some other client will be hanging onto a connection, preventing the DROP DATABASE from working. To workaround this problem, this method cancels all the connections so that the db:reset command will work. Note that there's still a slight possibility a client connects after its connection is terminated. If this is an issue, we could solve it by revoking CONNECT access, but for now it seems this works. Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/450
* | | | Merge branch 'add-client-for-count-diverging-commits' into 'master'Grzegorz Bizon2019-02-122-0/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
| * | | Add client support for count diverging commitsJohn Cai2019-02-062-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the client call for the gitaly rpc CountDivergingCommits fixing signature simplifying commit logic adding test for max-count refactoring tests
* | | | Merge branch '52424-goodbye-hipchat' into 'master'Douglas Barbosa Alexandre2019-02-111-39/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove HipChat integration from GitLab Closes #52424 See merge request gitlab-org/gitlab-ce!22223
| * | | | Remove HipChat integration from GitLabNick Thomas2019-02-081-39/+0
| | | | |
* | | | | Merge branch '57431-sprockets-caches-files-independent-of-content' into 'master'Lin Jen-Shin2019-02-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use correct integrity hash for sprockets caching Closes #57431 See merge request gitlab-org/gitlab-ce!25033
| * | | | | Use correct integrity hash for sprockets caching57431-sprockets-caches-files-independent-of-contentLukas Eipert2019-02-081-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use self.integrity_uri over self.hexdigest_integrity_uri(digest), as the latter always returned nil leading to improper cache invalidation. We are alos enabling caching of `tmp/cache/assets/sprockets` again, to get those performance gains.
* | | | | Merge branch 'an-peek-jaeger' into 'master'Grzegorz Bizon2019-02-112-0/+32
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Provide a performance bar link to the Jaeger UI See merge request gitlab-org/gitlab-ce!24902
| * | | | Provide a performance bar link to the Jaeger UIan-peek-jaegerAndrew Newdigate2019-02-082-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jaeger is a distributed tracing tool. This change adds a "Tracing" link to the performance bar to directly link to a current request in Jaeger. This is useful for two reasons: 1 - it provides affordance to developers that the distributed tracing tool is available, so that it can quickly be discovered. 2 - it allows developers to quickly find a specific trace without having to manually navigate to a second user-interface.
* | | | | Merge branch 'patch-40' into 'master'Grzegorz Bizon2019-02-081-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Update dotNet test task to upload test results on failure See merge request gitlab-org/gitlab-ce!24591
| * | | | Update dotNet test task to upload test results on failurePatrick Galbraith2019-01-231-0/+1
| | | | |
* | | | | Upgrade cluster applications, starting with runnerThong Kuah2019-02-073-84/+26
| | | | |
* | | | | Merge branch 'jlenny-AddPagesTemplates' into 'master'Douglas Barbosa Alexandre2019-02-071-8/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pages templates on the new project templates menu Closes #47857 See merge request gitlab-org/gitlab-ce!24906
| * | | | | Project template: Fall back to GitLab logojlenny-AddPagesTemplatesLukas Eipert2019-02-071-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-svg to provide the icons for rails, spring and express. For the new GitLab pages templates, we are falling back to the GitLab logo.
| * | | | | Add Pages templatesJason Lenny2019-02-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds templates for the 5 most popular Pages templates to the new project menu. This does not add unique icons for the templates because that turned out more complicated than expected, and this feature is valuable without them.
* | | | | | Merge branch 'master' into ↵Sean McGivern2019-02-0725-169/+521
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | | | | Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'Grzegorz Bizon2019-02-071-14/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves domain setting to Clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24580
| | * | | | | Addresses backend/db review commentsMayra Cabrera2019-02-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes multiple typos on AutoDevops script - Add an alias to Clusters::Cluster#domain as base_domain, so it's more descriptive - Removes unnecessary memoization on qa specs - Changes migration to a post migration to deal better with traffic on big instances (like gitlab.com)
| | * | | | | Modifies ADO script to include new variableMayra Cabrera2019-02-041-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure KUBE_INGRESS_BASE_DOMAIN existence by setting his value to AUTO_DEVOPS_DOMAIN if the first one doesnt exists. Also made corresponding changes throughout the whole script Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580
| * | | | | | Merge branch 'local-markdown-version' into 'master'Douglas Barbosa Alexandre2019-02-071-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add local markdown version Closes #32789 See merge request gitlab-org/gitlab-ce!24822
| | * | | | | | Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
| * | | | | | | Template for Android with FastlaneJason Lenny2019-02-072-0/+123
| | | | | | | |
| * | | | | | | Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'Nick Thomas2019-02-071-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API support for setting squash commit message during squash Closes #56014 See merge request gitlab-org/gitlab-ce!24784
| | * | | | | | | API support for squash commit message during merge56014-api-merge-request-squash-commit-messagesLuke Duncalfe2019-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues https://gitlab.com/gitlab-org/gitlab-ce/issues/47149 https://gitlab.com/gitlab-org/gitlab-ce/issues/56014
| * | | | | | | | Merge branch 'api-group-labels' into 'master'Sean McGivern2019-02-077-102/+236
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API group labels Closes #44901 See merge request gitlab-org/gitlab-ce!21368
| | * | | | | | | Add documentationapi-group-labelsRobert Schilling2019-02-061-1/+1
| | | | | | | | |
| | * | | | | | | Simplify label helper and correct versionRobert Schilling2019-01-314-73/+61
| | | | | | | | |
| | * | | | | | | Factor out common label APIRobert Schilling2019-01-316-109/+129
| | | | | | | | |
| | * | | | | | | Incorporate feedback from RobertRobert Schilling2019-01-314-13/+49
| | | | | | | | |
| | * | | | | | | Correctly search for labels in parent groupsRobert Schilling2019-01-312-6/+6
| | | | | | | | |
| | * | | | | | | Factor out group labels entityRobert Schilling2019-01-314-37/+31
| | | | | | | | |
| | * | | | | | | Use proper finder helper to get existing labelsRobert Schilling2019-01-311-11/+13
| | | | | | | | |
| | * | | | | | | fix rebasingRobert Schilling2019-01-312-10/+1
| | | | | | | | |
| | * | | | | | | Replace findersRobert Schilling2019-01-312-5/+5
| | | | | | | | |
| | * | | | | | | Incorporate feedback from NickRobert Schilling2019-01-313-19/+14
| | | | | | | | |
View Lorry Controller Status