summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-141-2/+2
|
* Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-142-0/+62
|\ | | | | | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each other Closes #36054 See merge request gitlab-org/gitlab-ce!14289
| * Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-132-11/+48
| | | | | | | | | | | | | | | | | | When a note is part of a discussion, the email sent out will be `In-Reply-To` the previous note in that discussion. It also `References` all the previous notes in that discussion, and the original issue. Closes gitlab-org/gitlab-ce#36054.
| * Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-131-0/+25
| | | | | | | | | | | | | | When a note is part of a discussion, the email sent out should be `In-Reply-To` the previous note in that discussion. Closes gitlab-org/gitlab-ce#36054
* | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use author info on commits list page rather than most recent commit date Closes #25317 See merge request gitlab-org/gitlab-ce!15868
| * | Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
| | |
* | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1412-23/+181
|\ \ \ | | | | | | | | | | | | | | | | Use a dedicated queue for each Sidekiq worker See merge request gitlab-org/gitlab-ce!15882
| * | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ↵Douwe Maan2017-12-133-4/+57
| | | | | | | | | | | | | | | | manually set their queue
| * | | Use a dedicated queue for each workerDouwe Maan2017-12-1210-19/+124
| | | |
* | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-145-101/+99
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Export date utility functions as ES6 modules See merge request gitlab-org/gitlab-ce!15782
| * | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-1337-338/+926
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (85 commits) Export old code into es6 modules Use relative URL for projects to avoid storing domains Fix spec by avoiding monkeypatching Return the noteable in Note#touch_noteable add CHANGELOG.md entry for !15889 fix broken empty state assets for environment monitoring page removed tab indexes from tag form Refactor entrypoint override docs Present member collection at the controller level Adds i18n check the import_status field before doing SQL operations to check the import url Fix rubocop offence Fix entrypoint overriding documentation Remove unnecessary js-issuable-edit Use memoization for commits on diffs Move Repository#write_ref to Git::Repository#write_ref Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated Center cluster title Remove noisy notification from QA base page Remove unused page from hashed storage QA scenario ...
| * \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-11116-851/+2262
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (112 commits) small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc Improve down step of removing issues.assignee_id column Fix specs after removing assignee_id field Remove issues.assignee_id column Resolve conflicts in app/models/user.rb Fix image view mode Do not raise when downstream pipeline is created Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Remove allocation tracking code from InfluxDB sampler for performance ...
| * \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-0726-465/+1745
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (82 commits) Docs: add EEU tier to the landing page CE backport of ProtectedBranches API changes Support uploads for groups Update pipeline create chain Prometheus metric Don't set timeago title to what was already there. Resolve "Display member role per project" The API isn't using the appropriate services for managing forks Add chevron to create dropdown on repository page Rename GKE as Kubernetes Engine Fix specs for MySQL Fix broken tests Refactor banzai to support referencing from group context Fix specs after rebase Prevent dups when using StringIO for binary reads Bump redis-rails to 5.0.2 to get redis-store security updates add note on deploying Pages to a private network Bump GITLAB_SHELL_VERSION Updates the dropdown to match the docs and remove old hack of stop event propagation Move invalid builds counter out of the transaction Add invalid builds counter metric to stage seeds class ...
| * | | | | | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-075-101/+99
| | | | | | |
* | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-135-3/+167
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ordering to projects contributors in API Closes #13695 See merge request gitlab-org/gitlab-ce!15469
| * | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-135-3/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name|email|commits. The available `sort` options are: asc|desc.
* | | | | | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-137-25/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify dialog modal/popup dialog/confirmation dialog/modal to modal See merge request gitlab-org/gitlab-ce!15865
| * | | | | | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-122-5/+5
| | | | | | | | |
| * | | | | | | | Rename popup-dialog to modalWinnie Hellmann2017-12-125-20/+20
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898
| * | | | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* | | | | | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into ↵Robert Speicher2017-12-131-0/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Cache feature check for 1 minute for MethodCall instrumentation toggle See merge request gitlab-org/gitlab-ce!15800
| * | | | | | | | | fix test case descriptionPawel Chojnacki2017-12-131-1/+1
| | | | | | | | | |
| * | | | | | | | | Expire feature flag cache after 1minutePawel Chojnacki2017-12-121-5/+3
| | | | | | | | | |
| * | | | | | | | | use class variables instead of CONSTANTsPawel Chojnacki2017-12-121-2/+2
| | | | | | | | | |
| * | | | | | | | | Use AtomicFixNum to implement CAS isolated cache update.Pawel Chojnacki2017-12-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e. Using compare and swap we update the expires_at value. The thread that actually is able to update this value will also set the cache holding method_call enabled state
| * | | | | | | | | Implemente measurement enabled cache using AtomicReferencePawel Chojnacki2017-12-121-2/+2
| | | | | | | | | |
| * | | | | | | | | Implement simple in memory cache that expires after 5 minutesPawel Chojnacki2017-12-121-6/+24
| | | | | | | | | |
| * | | | | | | | | Cache feature check for 5 minutes for MethodCall instrumentation togglePawel Chojnacki2017-12-121-0/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-tcp-check-rake-task' into 'master'Rémy Coutable2017-12-131-0/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a gitlab:tcp_check rake task See merge request gitlab-org/gitlab-ce!15759
| * | | | | | | | | | Add a gitlab:tcp_check rake taskNick Thomas2017-12-131-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid relying on telnet / netcat being installed
* | | | | | | | | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-134-5/+35
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
| * | | | | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-134-5/+35
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bvl-backport-migration-spec-changes-to-ce' into 'master'Douwe Maan2017-12-134-29/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create models directly in migration specs See merge request gitlab-org/gitlab-ce!15874
| * | | | | | | | | | | Create models directly in migration specsbvl-backport-migration-spec-changes-to-ceBob Van Landuyt2017-12-124-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the factories. Since the factories might be using columns that aren't available in the schema at version the particular spec is running in.
* | | | | | | | | | | | Merge branch 'fix-create-mr-from-issue-with-template' into 'master'Rémy Coutable2017-12-131-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute quick actions when creating MR from issue Closes gitlab-ee#4277 See merge request gitlab-org/gitlab-ce!15810
| * | | | | | | | | | | | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-templateSean McGivern2017-12-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE, this does nothing - the `MergeRequests::BuildService` will, at the time of writing, never return a description for this case. In EE, a project can have a default MR template, which will be returned by the service. Previously we were only using the description passed in the params, ignoring any already set on the object. Now we fall back to the one set on the object if there was none in the params, allowing quick actions to be executed from default MR templates when creating an MR from an issue.
* | | | | | | | | | | | | Merge branch 'new-nav-tech-debt' into 'master'Phil Hughes2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove page-with-new-nav class See merge request gitlab-org/gitlab-ce!15819
| * | | | | | | | | | | | Rename page-with-sidebar to layout-pagenew-nav-tech-debtAnnabel Dunstone Gray2017-12-081-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Export old code into es6 modulesFilipa Lacerda2017-12-132-40/+38
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update styling of empty states" Closes #40468 See merge request gitlab-org/gitlab-ce!15791
| * | | | | | | | | | | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1249-380/+749
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (54 commits) Updated image for diff navigation docs Milestone sidebar docs Use app host instead of asset host when rendering image blob or diff ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build Use shared interceptor in note specs Ignore temporary table in schema Check for null in job tooltip title Clarify casing of I18N placeholder names fixes some markup issues in the js style guide docs Fix migration that removes issues.branch_name small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc ...
| * | | | | | | | | | | | | Fix broken testFilipa Lacerda2017-12-111-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fix spec by avoiding monkeypatchingMichael Kozono2017-12-121-4/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch ↵Robert Speicher2017-12-124-8/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | | | | | | | | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-123-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Refactor member view by using presenterTM Lee2017-12-113-8/+272
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-122-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
| * | | | | | | | | | | | | Fix rubocop offenceZeger-Jan van de Weg2017-12-121-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-122-1/+16
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gitaly CommitService is being hammered by n + 1 calls, mostly when finding commits. This leads to this gRPC being turned of on production: https://gitlab.com/gitlab-org/gitaly/issues/514#note_48991378 Hunting down where it came from, most of them were due to MergeRequest#show. To prove this, I set a script to request the MergeRequest#show page 50 times. The GDK was being scraped by Prometheus, where we have metrics on controller#action and their Gitaly calls performed. On both occations I've restarted the full GDK so all caches had to be rebuild. Current master, 806a68a81f1baee, needed 435 requests After this commit, 154 requests
View Lorry Controller Status