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
2018-07-09Updates from `rubocop -a`Lin Jen-Shin
2018-06-06Add missing tests around rendering invalid merge requests (HTML+JSON)Ash McKenzie
2018-05-09Replace the `project/ff_merge_requests.feature` spinach test with an rspec ↵blackst0ne
analog
2018-01-31Make user/author use project.creator in most factoriesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-14Replace factory_girl_rails with factory_bot_railsRémy Coutable
I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06ignore the column before the migrationmicael.bergeron
reword the changelog remove dead code in the specs
2017-10-11add specmicael.bergeron
2017-10-07Commenting on image diffsFelipe Artur
2017-08-10Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin
so that we don't have to fetch it for non-forks
2017-08-09Fix some tests and report the error messageLin Jen-Shin
2017-08-09Fake out Repository#fetch_ref for merge request ifLin Jen-Shin
the project didn't have a repository setup. We don't try to stub it if the repository was already there.
2017-07-28Merge issuable "reopened" state into "opened"Yorick Peterse
Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
2017-04-19Don't delete a branch involved in an open merge request in "Delete all ↵Stan Hu
merged branches" service Customers were surprised by the previous behavior, which destroyed branches even though an open merge request existed for it. Closes #29427
2017-04-07Add indication for closed or merged issuables in GFMAdam Buckland
Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.
2017-04-03Fix brittle specsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-21Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern
This reverts merge request !10076
2017-03-20Todos performance: Include associations in FinderJarka Kadlecova
2017-03-01Update occurrences of MWBS to MWPSJames Lopez
Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
2017-01-25Use a project factory with a repository where necessaryRobert Speicher
2016-11-04Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos
are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-19Recreates missing group labels when moving project to another groupDouglas Barbosa Alexandre
2016-05-09Remove the annotate gem and delete old annotationsJeroen van Baarsen
In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
2016-03-16Fix MergeRequest#source_sha when there is no diffPierre de La Morinerie
`MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when a open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was un-noticed before – but now that !2217 has been merged, it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available.
2016-03-08Fixes "iid of max iid" in Issuable sidebar for merged MRRémy Coutable
Fixes #13928
2016-03-03Indicate how much an MR branch diverges from the target branchPierre de La Morinerie
2016-02-19Save merge commit id when MR is mergedRubén Dávila
2016-01-06Annotate modelsStan Hu
2015-12-05Incorporate feedbackZeger-Jan van de Weg
2015-11-13Annotate modelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-06Re-annotate modelsStan Hu
2015-06-22Fix Style/AsciiComments cop violationRobert Speicher
2015-03-06Added comment notification events to HipChat and Slack services.Stan Hu
Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
2015-01-22Annotate modelsDmitriy Zaporozhets
2014-08-25Annotate modelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06Fix satellite testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31Fix MR factory and some MR testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>