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
2016-10-19Fix after code reviewKamil Trzcinski
2016-10-19Fix implementation of Repository.with_forbidden_accessKamil Trzcinski
2016-10-19Forbid repository access when in lockKamil Trzcinski
2016-10-14Refactor ci_status on MergeRequestControllerZ.J. van de Weg
2016-10-14Show what time ago a MR was deployedZ.J. van de Weg
2016-10-12Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan
Removes inconsistency regarding tagging immediately as merged once you create a … - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20708 See merge request !6408
2016-10-11refactors tests because of gitlab-test repository changestiagonbotelho
2016-10-10Make searching for commits case insensitive.Adam Niedzielski
Fixes #21800.
2016-10-10removes inconsistency regarding tagging immediately as merged once you ↵tiagonbotelho
create a branch using new branch button and adds changelog entry
2016-10-05multi-file commitMarc Siegfriedt
add docs and tests - add additional validation allow move without content updated response
2016-10-04deployment refs in own folder, new method for creating refsZ.J. van de Weg
2016-09-20Add spec covering 'committer_hash'Dan Dunckel
2016-09-19Add optional 'author' param when making commitsDan Dunckel
2016-09-14Backport search_helper changes from EEValery Sizov
2016-09-12Simplify a condition in Repository#update_fileRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-10fixes distinction between renaming a file and updating its content andtiagonbotelho
refactors update file
2016-09-07Rename {commit,update_branch}_with_hooksJacob Vosmaer
2016-09-07Allow adding multiple commits in commit_with_hooksJacob Vosmaer
2016-09-02Make error message appropriate for end usersJacob Vosmaer
2016-09-02Use 'git update-ref' for safer web commitsJacob Vosmaer
2016-09-01Optimize branch lookups and force a repository reload for Repository#find_branchStan Hu
If `git gc` runs and `Repository` has an instance to `Rugged::Repository`, a bug in libgit2 may cause the instance to return a stale value or a missing branch. This change not only optimizes the branch lookup so we don't have to iterate through every branch, but it also works around the `git gc` issue by forcing a repository reload every time `Repository#find_branch` is called. See: https://github.com/libgit2/libgit2/issues/1534 Closes #15392, #21470
2016-08-25Display project icon from default branchHannes Rosenögger
This commit makes sure that the project icon is being read from the default branch instead of 'master'
2016-08-19Support integration with Koding (online IDE)Gokmen Goksel
Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format
2016-08-17Merge branch 'custom-events-tracking' into 'master' Douwe Maan
Tracking of custom events ## What does this MR do? This MR adds the ability to track custom events such as the number of Git pushes. ## Are there points in the code the reviewer needs to double check? The usual stuff. ## Why was this MR needed? We want to track more business level data such as the number of Git pushes, how many repositories are imported (and from where), etc. ## What are the relevant issue numbers? gitlab-org/gitlab-ce#13720 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @pcarranza See merge request !5830
2016-08-17Tracking of custom eventsYorick Peterse
GitLab Performance Monitoring is now able to track custom events not directly related to application performance. These events include the number of tags pushed, repositories created, builds registered, etc. The use of these events is to get a better overview of how a GitLab instance is used and how that may affect performance. For example, a large number of Git pushes may have a negative impact on the underlying storage engine. Events are stored in the "events" measurement and are not prefixed with "rails_" or "sidekiq_", this makes it easier to query events with the same name triggered from different parts of the application. All events being stored in the same measurement also makes it easier to downsample data. Currently the following events are tracked: * Creating repositories * Removing repositories * Changing the default branch of a repository * Pushing a new tag * Removing an existing tag * Pushing a commit (along with the branch being pushed to) * Pushing a new branch * Removing an existing branch * Importing a repository (along with the URL we're importing) * Forking a repository (along with the source/target path) * CI builds registered (and when no build could be found) * CI builds being updated * Rails and Sidekiq exceptions Fixes gitlab-org/gitlab-ce#13720
2016-08-12Move resolving code to ResolveServiceSean McGivern
2016-08-08Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez
2016-08-06Enable Style/SpaceAroundEqualsInParameterDefault copGabriel Mazetto
2016-08-03Use only deltas in diffs when scanning the last commit for changes in the ↵Stan Hu
avatar to save memory
2016-08-03switch from diff_file_collection to diffsPaco Guzman
So we have raw_diffs too
2016-07-28Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez
2016-07-28Merge branch ↵Rémy Coutable
'20308-fix-title-that-is-show-in-the-dropdown-toggle-button-on-projects-branches' into 'master' Fix the title of the toggle dropdown button ## What does this MR do? Fix the dropdown-button toggle displaying the correctly title. ## Are there points in the code the reviewer needs to double check? See if the title is displaying correctly and if the code is acceptable. ## Why was this MR needed? When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. ## What are the relevant issue numbers? Closes #20308. ## Screenshots (if relevant) ![filter-gitlab-ce](/uploads/52838679d134d57c6ff6120260806fda/filter-gitlab-ce.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5515
2016-07-28Fix the title of the toggle dropdown buttonHerminio Torres
Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value. E.g. When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. Change the implementation of the `link_to` `filter_branches_path` - Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`. - Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
2016-07-27Respective cache is now expired when creating a new branchtiagonbotelho
Project and branch cache is expired when project is still empty or new branch is created. develops tests accordingly Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-26Rescue Rugged::OSError (lock exists) when creating references.Paco Guzman
2016-07-25Merge branch 'use-project-id-in-repo-cache' into 'master' Yorick Peterse
Use project ID in repository cache to prevent stale data from persisting across projects See merge request !5460
2016-07-25Use project ID in repository cache to prevent stale data from persisting ↵Stan Hu
across projects We have a number of bugs caused by cache keys not being flushed properly during deletion of a project. Add the project ID to ensure this never happens. Closes #20027
2016-07-25Merge branch 'filter-branch-by-name' into 'master' Douwe Maan
Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
2016-07-24Revert "Merge branch ↵Alejandro Rodríguez
'17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
2016-07-22Merge branch 'master' into filter-branch-by-nametiagonbotelho
2016-07-22Gracefully handle case when keep-around references are corrupted or exist ↵Stan Hu
already We were seeing a number of error messages when attempting to create a keep-around ref: 1. Failed to create locked file `refs/keep-around/XYZ`: File exists 2. Failed to write reference `refs/keep-around/XYZ`: a reference with that name already exists. I'm not sure how these happen, but I suspect when multiple workers attempt to write the same file we may have an issue. The force parameter should help ensure the file gets created, as well as the rescues to prevent 500 Errors. Rugged/libgit2 unfortunately do not allow you to delete or re-create a reference that has been corrupted, even with the force parameter. Closes #20109
2016-07-22Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez
2016-07-21Add service to clean up repository archive cacheDouglas Barbosa Alexandre
Replace invocation of `find` with Ruby code that matches old cached files in a better, and safe way to avoid data-integrity issues.
2016-07-20Expire tags/branches repo cache before delete a repositoryPaco Guzman
2016-07-19refactors the search to enable users to filter and sort branches at thetiagonbotelho
same time and writes tests accordingly changes schema.db removes duplicate field inside CHANGELOG fix db/schema
2016-07-19implements branches filter functionality and tests accordinglytiagonbotelho
refactors find_similar_branches method to a one liner
2016-07-19implements the basic filter functionalitytiagonbotelho
2016-07-19fixes an issue cause by a bad mergetiagonbotelho
2016-07-19Merge branch 'master' into rename-repo-filestiagonbotelho
2016-07-19Fix of 'Commits being passed to custom hooks are already reachable when ↵Valery Sizov
using the UI'