summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Allow git pull/push on project redirectsMayra Cabrera2017-12-083-5/+60
|
* Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-081-1/+1
| | | | | | | | | | | | | | When displaying events we would load the target of those events, then render the entire data using our Markdown pipeline. This pipeline would eventually request the author of every target, leading to an additional query being executed for every target to get the author. To fix this we now eager load the author of the event's target. In my local environment this reduces the number of queries to display a project's Atom feed from 40 to 24 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878 for more information.
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-0/+21
|\ | | | | | | | | | | | | Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
| * Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-0/+21
| |
* | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵Kamil Trzciński2017-12-072-1/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
| * | Change feature flag to ci_disable_validates_dependencies to enable it as defaultShinya Maeda2017-12-071-1/+1
| | |
| * | Fix /build_spec.rbShinya Maeda2017-12-061-8/+8
| | |
| * | Optimize valid_dependency method by ayufan thoughtShinya Maeda2017-12-061-15/+11
| | |
| * | Add feature flagShinya Maeda2017-12-061-0/+2
| | |
| * | Add case when artifacts have not existed on dependenciesShinya Maeda2017-12-061-5/+15
| | |
| * | Use Class.new(StandardError) instead of custom extended error class. Bring ↵Shinya Maeda2017-12-061-2/+8
| | | | | | | | | | | | back specified_dependencies?.
| * | Fail jobs if its dependency is missingShinya Maeda2017-12-062-1/+8
| | |
* | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-077-19/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on individual commits inside an MR Closes #31847 See merge request gitlab-org/gitlab-ce!12148
| * | | adding view and feature specsmicael.bergeron2017-12-071-3/+6
| | | |
| * | | cache the Note#commit methodmicael.bergeron2017-12-071-8/+6
| | | |
| * | | revert the `#all_pipelines` method to use the pluckmicael.bergeron2017-12-071-2/+1
| | | | | | | | | | | | | | | | | | | | the `ci_pipelines.sha` column is not the same type than the `merge_request_diff_commits.sha` column (varchar, bytea)
| * | | add support for the commit reference filtermicael.bergeron2017-12-072-9/+15
| | | |
| * | | tidying up the changesmicael.bergeron2017-12-071-9/+0
| | | |
| * | | add support for commit (in mr) to reference filtermicael.bergeron2017-12-072-0/+13
| | | |
| * | | Allow commenting on individual commits inside an MRDouwe Maan2017-12-075-2/+22
| | | |
* | | | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-072-10/+12
|/ / /
* | | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-071-3/+7
|\ \ \ | | | | | | | | | | | | | | | | Refactor banzai to support referencing from group context See merge request gitlab-org/gitlab-ce!15766
| * | | Refactor banzai to support referencing from group contextce-backport-3615Jarka Kadlecova2017-12-061-3/+7
| | | |
* | | | Support uploads for groupsJarka Kadlecova2017-12-071-0/+4
| | | |
* | | | Resolve "Display member role per project"Mike Greiling2017-12-073-29/+83
| | | |
* | | | Throttle the number of UPDATEs triggered by touchYorick Peterse2017-12-064-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This throttles the number of UPDATE queries that can be triggered by calling "touch" on a Note, Issue, or MergeRequest. For Note objects we also take care of updating the associated "noteable" relation in a smarter way than Rails does by default.
* | | | Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-061-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE-Backport] Fix board filter when milestone is predefined See merge request gitlab-org/gitlab-ce!15750
| * | | | [CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654Felipe Artur2017-12-051-0/+7
| | | | |
* | | | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-062-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | List multiple clusters See merge request gitlab-org/gitlab-ce!15403
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-0511-23/+127
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-051-2/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵Kamil Trzcinski2017-12-051-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cluster-page-with-list-clusters
| | * | | | | | Remove cluster from Project modelMatija Čupić2017-12-041-1/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-0425-229/+249
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Don't disable the Rails mailer when seeding the test environment Documentation bug fixes: Added procedure to disable built-in Issues. Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` and fix a transient failing spec due to that Add changelog entry Show only group name by default and put full namespace in tooltip Adds validation for Project#ci_config_path not to contain leading slash Gracefully handle case when repository's root ref does not exist Set EE variable issue note store allow caching options to be specified for counting services Update CHANGELOG.md for 10.2.3 Add link to gitaly converation Fix pipeline config source specs and test it explicitly Set an artificial $HOME for gitaly in test Add a fixture file that uses seed-fu in the test env so that a borken seed-fu is detected Pin seed-fu to 2.3.6 since 2.3.7 is broken Do not set pipeline source after initialization updated diff spec fix for special charecter in file names We could simply count the commits ...
| * | | | | | | Merge branch '35616-move-k8-to-cluster-page' into ↵Kamil Trzcinski2017-12-056-12/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster-page-with-list-clusters
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵Kamil Trzcinski2017-12-031-0/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | cluster-page-with-list-clusters
| | * | | | | | | Add created? to Cluster modelMatija Čupić2017-12-011-0/+4
| | | | | | | | |
| * | | | | | | | Fix prevent modificationKamil Trzcinski2017-12-031-0/+14
| | | | | | | | |
| * | | | | | | | Fix controllers and linksKamil Trzcinski2017-12-031-3/+6
| | | | | | | | |
| * | | | | | | | Extend controllers to support a new data structure for manual Kubernetes ↵Kamil Trzcinski2017-12-031-0/+6
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | clusters
* | | | | | | | Merge branch '37354-pipelines-update' into 'master'Kamil Trzciński2017-12-061-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure head pippeline always corresponds with an MR Closes #37354 See merge request gitlab-org/gitlab-ce!14358
| * | | | | | | Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-3/+3
| | | | | | | |
| * | | | | | | Check if head_pipeline is correct before mergingFelipe Artur2017-12-051-4/+8
| | | | | | | |
| * | | | | | | Improve MergeRequest#head_pipelineFelipe Artur2017-12-051-5/+1
| | | | | | | |
| * | | | | | | Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-0/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Perform SQL matching of Build&Runner tags to greatly speed-up job pickingKamil Trzcinski2017-12-052-3/+22
| | | | | | |
* | | | | | | Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-051-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541
| * | | | | | Add custom brand text on new project pagesMarkus Koller2017-12-041-2/+1
| | | | | | |
* | | | | | | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-054-17/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
View Lorry Controller Status