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-06-03Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski
2016-06-03Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski
* commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
2016-06-03Fix other places where we still use commit attribute of BuildKamil Trzcinski
2016-06-03Fix more places where we should rename ci_commit to pipelineKamil Trzcinski
2016-06-03Merge branch 'patch-1' into 'master' Douwe Maan
Let contributors know where to start Needed becuase: https://gitlab.com/gitlab-org/gitlab-ce/issues/14905#note_12235996 See merge request !4455
2016-06-03Merge branch 'gh-branch-cleanup' into 'master' Douwe Maan
Ensure branch cleanup regardless of whether the GitHub import process succeeds Closes #17766 See merge request !4450
2016-06-03Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan
Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI: ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif) @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh :smiley: Closes #14139. See merge request !4414
2016-06-03Merge branch 'banzai-user-filter-queries'Douwe Maan
2016-06-03Merge branch 'todos-filter-project-delete' into 'master' Douwe Maan
Ensure we don't show TODOS for projects pending delete ## What does this MR do? Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon. ## Are there points in the code the reviewer needs to double check? An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause. Or we could just be more defensive in the view when iterating. ## Why was this MR needed? Todos page throws 500 error for users with todos in a project pending deletion. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813 cc\ @stanhu See merge request !4300
2016-06-03Use foreign_key to define column nameKamil Trzcinski
2016-06-03Merge branch '13313-fix-deprecation-warnings' into 'master' Robert Speicher
Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Fixes #13313. See merge request !4441
2016-06-03Merge branch '13312-remove-issuable-is_assigned' into 'master' Robert Speicher
Remove unused Issuable#is_assigned? method Fixes #13312. See merge request !4440
2016-06-03Delegate to pipeline instead of commitKamil Trzcinski
2016-06-03Use pipelines in context of ProjectKamil Trzcinski
2016-06-03Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
2016-06-03Try to use `pipeline` where applicableKamil Trzcinski
2016-06-03Rename Ci::Build commit to pipelineKamil Trzcinski
2016-06-03Use ci_commits tableKamil Trzcinski
2016-06-03Let contributors know where to start Zeger-Jan van de Weg
gitlab-org/gitlab-ce/issues/14905#note_12235996
2016-06-03Merge branch 'dz-code-tab'Dmitriy Zaporozhets
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
2016-06-03Update test since branch removal does not render template anymoreDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Fix more tests with new Code tabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Update tests to match new Code tab logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Put project Files and Commits tabs under Code tabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Merge branch 'dz-more-ui-guides' into 'master' Dmitriy Zaporozhets
Add icons and buttons to UI guide cc @jschatz1 @skyruler See merge request !4445
2016-06-03Merge branch 'fix/import-error-handling' into 'master' Robert Speicher
Fix import error handling Fixes https://gitlab.com/gitlab-com/support-forum/issues/745 This improves import error handling: - Now if there's an error during importing before the job is scheduled, we also mark the project status as failed. - Refactored setting the status to failed into one single method. - Fixed some situations where the error message was missing or simply empty. See merge request !4366
2016-06-03Update repository_import_worker.rbJames Lopez
2016-06-03fix import service specJames Lopez
2016-06-03added changelogJames Lopez
2016-06-03fix some issues and improved error output for forkingJames Lopez
2016-06-03some refactoring and fixing specJames Lopez
2016-06-03fix empty message on shell errorJames Lopez
2016-06-03fix create service error handling - missing setting import status to failedJames Lopez
2016-06-03Ensure branch cleanup regardless of whether the import process succeedsDouglas Barbosa Alexandre
2016-06-03Fix failing todo testsDJ Mountney
2016-06-03Reorder the todos because the use of the project finder attempts to order ↵DJ Mountney
them differently
2016-06-02Merge branch '18031-sidebar-labels-queries' into 'master' Yorick Peterse
See merge request !4436
2016-06-02Merge branch 'rs-todo-has-tooltip' into 'master' Dmitriy Zaporozhets
Add tooltips to todo target links See merge request !4370
2016-06-02Fix typoDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02Add icons and buttons to UI guideDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02issuable#labels_array explicitly load the labelsPaco Guzman
This will be useful when you want to ask for the number of items and later iterate over them, without needing to ask if the association is load or not. So you avoid extra database queries
2016-06-02Update target todo test to use a public projectDJ Mountney
2016-06-02Use the project finder in the todos finder to limit todos to just ones ↵DJ Mountney
within projects you have access to.
2016-06-02Move filtering todos by projects not pending deletion into a scope on the ↵DJ Mountney
todo model
2016-06-02Reduce the filters on the todos joins project query by being explicit about ↵DJ Mountney
the join
2016-06-02Ensure we don't show TODOS for projects pending deleteDJ Mountney
By joining the Todos on the project table.
2016-06-02Update CHANGELOG for 8.8.3Robert Speicher
[ci skip]
2016-06-02Merge branch 'issue_18102' into 'master' Robert Speicher
Fixes missing number on generated ordered list Closes #18102 See merge request !4437
2016-06-02Merge branch 'reduce-fog-deps' into 'master' Robert Speicher
Reduce number of fog gem dependencies Currently supported: * AWS * Azure * OpenStack * Google * local storage Closes #15352 See merge request !4396
2016-06-02Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rbRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>