summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
| | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵Rémy Coutable2017-08-081-1/+1
|\ | | | | | | | | | | | | | | | | 'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
| * Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-041-1/+1
| | | | | | | | | | | | GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-041-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-041-1/+1
| | | | | | | | | | This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
* | Merge branch 'master' into ideMike Greiling2017-08-0719-239/+530
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * \ Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * | Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
| | | |
| * | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-0/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
| | * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-0/+14
| | |/ / | | | | | | | | | | | | Closes gitaly#443
| * | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-072-1/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
| | * | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-072-1/+21
| | |/ / | | | | | | | | | | | | Closes gitaly#437
| * | | Merge branch 'perf.policy-runner-reduce-loops' into 'master'Sean McGivern2017-08-071-5/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | DeclarativePolicy: reduce iterations of the step set See merge request !13352
| | * | | more eagerly bail when the state is preventedhttp://jneen.net/2017-08-071-4/+3
| | | | |
| | * | | reduce iterations by keeping a count of remaining enablershttp://jneen.net/2017-08-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | rather than iterating the whole remaining step set with .all?(&:prevent?)
| * | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-45/+50
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275
| | * | | | Backport changes in ↵Nick Thomas2017-08-072-45/+50
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
| * | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-60/+76
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| | * | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-7/+6
| | | | | | |
| | * | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-60/+77
| | | | | | |
| * | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-074-20/+55
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| | * | | | | | Change `project.path_with_namespace` to `project.disk_path`Douglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Allow users to disable SSL verification if not connecting to github.comDouglas Barbosa Alexandre2017-08-071-4/+15
| | | | | | | |
| | * | | | | | Fix small typo on Github::Import#fetch_releasesDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Import GitHub releasesDouglas Barbosa Alexandre2017-08-071-0/+2
| | | | | | | |
| | * | | | | | Fix Github::Import cache for user idsDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Extrac common timeout to a constant on Github::ClientDouglas Barbosa Alexandre2017-08-071-2/+4
| | | | | | | |
| | * | | | | | Fix small typoe on Github::Client#root_endpointDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Expire content cache when repository fetch failsDouglas Barbosa Alexandre2017-08-071-2/+3
| | | | | | | |
| | * | | | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Set the GitHub API token on options hashDouglas Barbosa Alexandre2017-08-071-2/+2
| | | | | | | |
| | * | | | | | Fix small typoe on GitHub import rake taskDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | |
| | * | | | | | Move GitHub root endpoint methods to Github::ClientDouglas Barbosa Alexandre2017-08-072-17/+19
| | | | | | | |
| | * | | | | | Use a custom root endpoint if defined on GH ominiauth provider settingsDouglas Barbosa Alexandre2017-08-072-2/+17
| | | | | | | |
| | * | | | | | Use project.import_url to fetch repositories from GithubDouglas Barbosa Alexandre2017-08-072-9/+11
| | | | | | | |
| * | | | | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-072-0/+94
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * | | | | | | Fix last feature test for project templatesZ.J. van de Weg2017-08-071-1/+2
| | | | | | | | |
| | * | | | | | | After merge cleanupZ.J. van de Weg2017-08-071-3/+4
| | | | | | | | |
| | * | | | | | | Fixes race condition in project uploadsTiago Botelho2017-08-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
| | * | | | | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0786-786/+1710
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| | * | | | | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| | * | | | | | | | [ci skip] Adds svgs and css for all iconsFilipa Lacerda2017-08-011-3/+1
| | | | | | | | | |
| | * | | | | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-012-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration, and some stuff is missing. But basically this rake task does a clone of a project we've pointed it to. Than creates a project on the GDK, which should be running in the background. This project is exported, after which we move that archive to the location we need it. We clean up by removing the generated project. The first idea was to export the project on .com too, however than we might run into ImportExport versions mismatch. This could've been circumvented by checkout out an older commit locally. This however is not needed yet, so we opted to not go this route yet, instead we will iterate on what we got.
| | * | | | | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-282-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
| * | | | | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-072-41/+74
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| | * | | | | | | | DRY up caching in AbstractReferenceFilterSean McGivern2017-08-071-40/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a lot of copied and pasted code, when the different elements were very small and easy to get wrong.
| | * | | | | | | | Support references to group milestonesSean McGivern2017-08-072-11/+64
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
| * | | | | | | | Merge branch 'gitlab-git-repository-log-options' into 'master'Sean McGivern2017-08-071-14/+15
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Set default options outside the raw_log method See merge request !13346
| | * | | | | | | Set default options outside the raw_log methodJacob Vosmaer2017-08-071-14/+15
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raw_log method is meant to become the Gitaly RPC boundary. By setting the defaults before doing the RPC we keep the RPC implementation simpler. We also sidestep the unfortunate subtleties of what happens when options[:limit] is not set, or nil.
| * | | | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-53/+123
| |/ / / / / /
View Lorry Controller Status