summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ideMike Greiling2017-08-0764-271/+1523
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Show all labelsRegis Boudinot2017-08-083-17/+21
| |
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0811-20/+109
| |\ | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0711-20/+109
| | |
| * | 33874 confidential issue redesignRegis Boudinot2017-08-074-0/+169
| | |
| * | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-1/+1
| | |
| * | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-9/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-9/+21
| | |/ | | | | | | | | | Closes gitaly#443
| * | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-075-10/+122
| |\ \ | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326
| | * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-075-10/+122
| | | |
| * | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-074-5/+125
| | | |
| * | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-075-4/+71
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store & use ConvDev percentages returned by Version app Closes #35761 See merge request !13217
| | * | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-075-4/+71
| | | | |
| * | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-074-26/+160
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-26/+160
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
| * | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-0/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| | * | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-5/+5
| | | | | | |
| | * | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-0/+71
| | | | | | |
| * | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-073-6/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| | * | | | | | fix failing specs due phantomJS scroll positionMike Greiling2017-08-041-4/+4
| | | | | | | |
| | * | | | | | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-042-2/+0
| | | | | | | |
| * | | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-072-25/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| | * | | | | | | Does not fetch repository when importing from GitHub on import serviceDouglas Barbosa Alexandre2017-08-071-24/+8
| | | | | | | | |
| | * | | | | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-075-12/+137
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * | | | | | | | Fix html structureFilipa Lacerda2017-08-071-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes test for removed behavior
| | * | | | | | | | Port form back to use form_tagZ.J. van de Weg2017-08-071-2/+2
| | | | | | | | | |
| | * | | | | | | | Fix last feature test for project templatesZ.J. van de Weg2017-08-071-2/+2
| | | | | | | | | |
| | * | | | | | | | After merge cleanupZ.J. van de Weg2017-08-073-8/+4
| | | | | | | | | |
| | * | | | | | | | Fixes race condition in project uploadsTiago Botelho2017-08-071-0/+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-071289-4469/+9612
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-013-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| | * | | | | | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0710-133/+286
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| | * | | | | | | | | | Show group milestones in autocompleteSean McGivern2017-08-071-0/+27
| | | | | | | | | | | |
| | * | | | | | | | | | Create system notes for group milestone changesSean McGivern2017-08-072-16/+43
| | | | | | | | | | | |
| | * | | | | | | | | | Support references to group milestonesSean McGivern2017-08-077-117/+216
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
| * | | | | | | | | | Merge branch '36052-reset-only-migration-models' into 'master'Sean McGivern2017-08-072-2/+12
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset only migration models Closes #36052 See merge request !13336
| | * | | | | | | | | Reset only migration models36052-reset-only-migration-modelsLin Jen-Shin2017-08-072-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we could make sure migration tests could run even if geo is not setup in EE. This is because we have a model like this: ``` ruby class Geo::BaseRegistry < ActiveRecord::Base def self.connection raise 'Geo secondary database is not configured' unless Gitlab::Geo.geo_database_configured? super end end ```
| * | | | | | | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-1/+205
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | fix repo_edit_button_spec.jsMike Greiling2017-08-071-0/+1
| | | | | | | | | |
* | | | | | | | | | fix test failures in repo_preview_spec.jsMike Greiling2017-08-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into ideMike Greiling2017-08-07104-462/+1909
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * | | | | | | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-074-15/+40
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069
| | * | | | | | | | | Allow wiki pages to be renamed in the UIwendy04022017-08-034-15/+40
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'gitaly-386-shell-config' into 'master'Robert Speicher2017-08-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly needs to know where to find gitlab-shell See merge request !13306
| | * | | | | | | | | fix testsgitaly-386-shell-configKim "BKC" Carlbäcker2017-08-041-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-072-15/+126
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add star for action scope, in order to delete image from registry Closes #26465 See merge request !13248
| | * | | | | | | | | | Rename user_can_admin? because it's more accurateadd-star-for-action-scopeLin Jen-Shin2017-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the test because we no longer have :empty_project, just use :project is the same as before