Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-11Add option to disable project export on instanceRobin Bobbitt
2017-08-11Merge branch 'split-events-into-push-events' into 'master'Sean McGivern
Use a separate table for storing push events See merge request !12463
2017-08-10Use a specialized class for querying eventsYorick Peterse
This changes various controllers to use the new EventCollection class for retrieving events. This class uses a JOIN LATERAL query on PostgreSQL to retrieve queries in a more efficient way, while falling back to a simpler / less efficient query for MySQL. The EventCollection class also includes a limit on the number of events to display to prevent malicious users from cycling through all events, as doing so could put a lot of pressure on the database. JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0 and as such this optimisation is only used when using PostgreSQL 9.3 or newer.
2017-08-10Cache Appearance instances in RedisYorick Peterse
This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
2017-08-10Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam
Its usage has been removed at 2fa22a0729.
2017-08-09Enable the Layout/SpaceBeforeBlockBraces copRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Re-enable SqlInjection and CommandInjectionBrian Neel
2017-08-08Merge branch 'master' into ideMike Greiling
* 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 ...
2017-08-08Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
2017-08-07Merge branch 'master' into ideMike Greiling
* 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 ...
2017-08-07[EE Backport] Update log audit event in omniauth_callbacks_controller.rbJames Lopez
2017-08-07Merge branch 'zj-project-templates' into 'master'Sean McGivern
Allow projects to be started from a template Closes #32420 See merge request !13108
2017-08-07Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira
2017-08-07Port form back to use form_tagZ.J. van de Weg
2017-08-07Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern
Improve various parts of Dashboard::ProjectsController See merge request !13319
2017-08-07Fix last feature test for project templatesZ.J. van de Weg
2017-08-07After merge cleanupZ.J. van de Weg
2017-08-07GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandErrorBob Van Landuyt
2017-08-07Eager load project creators for project dashboardsYorick Peterse
This solves an N+1 query problem where for every project we'd query the creator separately just to figure out what avatar to display.
2017-08-07Merge branch 'master' into zj-project-templatesFilipa Lacerda
* 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 ...
2017-08-04Add a Circuitbreaker for storage pathsBob Van Landuyt
2017-08-04Fix ABC size of BlobController#showLuke "Jared" Bennett
2017-08-03Add render_error to blob JSONDouwe Maan
2017-08-03Avoid plucking Todo ids and use sub-queries insteadToon Claes
TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
2017-08-03More backend cleanupDouwe Maan
2017-08-03Clean up some backendDouwe Maan
2017-08-03Merge branch 'master' into ideDouwe Maan
2017-08-01Fix UselessAssignment offense in projects_controllerLuke "Jared" Bennett
2017-08-01Fix Issue board when using Ruby 2.4Rémy Coutable
In Ruby 2.4, Hash#compact exists and returns a Hash, while in Ruby 2.3, Hash#compact is implemented by Rails and returns a new `ActionController::Parameters` instance in this case. Also, `ActionController::Parameters#compact` is deprecated in Rails 5.1 so we're using `reject { |_, value| value.nil? }` instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-01Fix rubocopLuke "Jared" Bennett
2017-08-01Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg
First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
2017-08-01Add option to use CommitLanguages RPCJacob Vosmaer
2017-07-31Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-31Add environment instance var to BlobController#show html respLuke "Jared" Bennett
2017-07-29Changes to `raw_size` to take advantage of LFS.Jacob Schatz
2017-07-29Adds `raw_size` to take advantage of LFSJacob Schatz
2017-07-28Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz
2017-07-28render blob/show if not show_new_repo?Luke "Jared" Bennett
2017-07-28Adds new ruby help for dropdowns for branchesJacob Schatz
2017-07-28Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan
Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
2017-07-28Merge branch '26890-sort-branches' into 'master'Rémy Coutable
This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
2017-07-28Fix replying to commit comments on MRs from forksSean McGivern
A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
2017-07-28Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-28Allow projects to be started from a templateZ.J. van de Weg
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.
2017-07-28Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan
Backport some recent changes related to LDAP from EE See merge request !13119
2017-07-28Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern
Add remote IP, user ID and username to JSON lograge output See merge request !13147
2017-07-28Merge branch '35224-transform-user-profile-javascript-into-async-bundle' ↵Tim Zallmann
into 'master' Resolve "Transform user profile javascript into async bundle" Closes #35224 See merge request !12929
2017-07-28Add remote IP, user ID and username to JSON lograge outputStan Hu
This makes the logs a bit more useful to search requests by users.
2017-07-28Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher
Add all ApplicationSettings attributes to the API See merge request !12851
2017-07-27Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher
Prevent concurrent editing wiki Closes #1827 See merge request !9707