summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0631-156/+1798
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0653-184/+2031
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-06124-948/+1957
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-034-5/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename-ci-commit-phase-2: Rename remaining ci_commits in specs
| * | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-0317-88/+88
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-0782-894/+895
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Ci::Commit in specs This is second iteration of renaming Ci::Commit occurences, this time I try to rename all `let's` and `factories` to match what type of object is created: 1. Rename factories: `ci_[...]_commit_[...]` to `ci_[...]_pipeline_[...]`, 2. Rename all `let's(:[ci_]commit)` to `let(:pipeline)`, 3. Rename all occurrences of `[ci_]commit` to `pipeline` if Pipeline object is created cc @grzesiek @DouweM See merge request !4463
| * | | | | | | | | Fix remaining test offensesrename-ci-commit-phase-2Kamil Trzcinski2016-06-072-8/+8
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0729-102/+416
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fix tests failuresKamil Trzcinski2016-06-077-44/+44
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0622-136/+1501
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-069-20/+297
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commitKamil Trzcinski2016-06-061-3/+23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-068-18/+274
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0653-184/+2031
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0652-180/+2027
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/builds_spec.rb
| * | \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-06124-949/+1958
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-06116-907/+1916
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-0611-44/+44
| | | | | | | | | | |
| * | | | | | | | | | Rename remaining ci_commits in specsKamil Trzcinski2016-06-034-5/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename-ci-commit: Fix merge_request handling
| | * | | | | | | | Fix merge_request handlingKamil Trzcinski2016-06-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Rename `commit` to `pipeline` in application codeKamil Trzcinski2016-06-032-16/+16
| | | | | | | | | |
| * | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-0339-375/+373
| |/ / / / / / / /
| * | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-0321-22/+270
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-035-27/+27
| | | | | | | | |
| * | | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-038-18/+18
| | | | | | | | |
| * | | | | | | | Use foreign_key to define column nameKamil Trzcinski2016-06-031-2/+2
| | | | | | | | |
| * | | | | | | | Delegate to pipeline instead of commitKamil Trzcinski2016-06-031-1/+1
| | | | | | | | |
| * | | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-0313-20/+20
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0340-204/+270
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-035-10/+10
| | | | | | | | | |
| * | | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-0324-100/+100
| | | | | | | | | |
| * | | | | | | | | Use ci_commits tableKamil Trzcinski2016-06-031-0/+2
| | | | | | | | | |
| * | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-0235-81/+81
| | | | | | | | | |
* | | | | | | | | | Merge branch 'gh-disable-webhooks'Douwe Maan2016-06-075-4/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-061-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Add a message warning user that Webhooks will be disabledDouglas Barbosa Alexandre2016-06-061-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Disable Webhooks before proceeding with the GitHub importDouglas Barbosa Alexandre2016-06-063-4/+110
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gh-fix-comments-on-diff'Douwe Maan2016-06-073-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diffDouglas Barbosa Alexandre2016-06-063-0/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments on diff after LegacyDiffNote was extracted from Note
* | | | | | | | | | Merge branch 'gh-rate-limit'Douwe Maan2016-06-077-36/+97
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-061-0/+1
| | | | | | | | | |
| * | | | | | | | | Move create! method from formatters to the BaseFormatterDouglas Barbosa Alexandre2016-06-065-10/+14
| | | | | | | | | |
| * | | | | | | | | Import GitHub repositories respecting the API rate limitDouglas Barbosa Alexandre2016-06-065-36/+92
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Octokit auto pagination set the page size to the maximum 100, and seek to not overstep the rate limit. When the rate limit is reached its raises an exception, and stop doing new requests. Here we use a custom pattern for traversing large lists, so we can check if we’ll reach the rate limit and wait the API to reset the rate limit before making new requests.
* | | | | | | | | Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-077-0/+289
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License finder gem Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license. https://github.com/pivotal/LicenseFinder See also: gitlab-com/operations#164 See merge request !3775
| * | | | | | | | | Resolve feedback.Connor Shea2016-06-062-2/+2
| | | | | | | | | |
| * | | | | | | | | Add relevant commands to the licensing document, resolve some feedback.Connor Shea2016-06-062-3/+34
| | | | | | | | | |
| * | | | | | | | | Make sure to mention the GNU Project and OSI-provided information regarding ↵Connor Shea2016-06-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the GPL so no one tries to disagree with that decision.
| * | | | | | | | | Add Licensing information and guidelines to the Documentation.Connor Shea2016-06-063-1/+60
| | | | | | | | | |
View Lorry Controller Status