summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use lazy reference extractor to get issue's MRslazy-reference-extractorDouwe Maan2015-12-151-1/+1
|
* Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1554-421/+471
|
* Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1426-376/+368
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| * Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1420-310/+69
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| | * Use Gitlab::Git instead of Ci::GitKamil Trzcinski2015-12-111-5/+0
| | |
| | * Fix specsKamil Trzcinski2015-12-111-1/+1
| | |
| | * Fix after column renameKamil Trzcinski2015-12-111-9/+0
| | |
| | * Fix triggers testsKamil Trzcinski2015-12-111-1/+1
| | |
| | * Reimplement Trigger APIKamil Trzcinski2015-12-113-0/+53
| | |
| | * Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-112-3/+3
| | |
| | * Add runners tokenKamil Trzcinski2015-12-114-7/+3
| | |
| | * Migrate CI::Project to ProjectKamil Trzcinski2015-12-1115-295/+19
| | |
| * | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-145-40/+87
| |\ \ | | |/ | | | | | | | | | | | | | | | Ci Services migrate See merge request !1985
| | * Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-101-0/+18
| | |
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-40/+69
| | |
| * | Bump Redis requirement to 2.8 for Sidekiq 4 requirementsStan Hu2015-12-121-1/+1
| | | | | | | | | | | | | | | | | | Closes #3649 [ci skip]
| * | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-112-26/+177
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
| | * | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10
| | | |
| | * | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-081-26/+40
| | | |
| | * | Check if commits are available in `RepositoryPush`Grzegorz Bizon2015-12-081-3/+3
| | | |
| | * | Duplicate options in `RepositoryPush`Grzegorz Bizon2015-12-081-4/+4
| | | |
| | * | Add `RepositoryPush` specsGrzegorz Bizon2015-12-081-5/+5
| | | |
| | * | Fix url helpers in RepositoryPushGrzegorz Bizon2015-12-081-3/+4
| | | |
| | * | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-081-3/+14
| | | |
| | * | Improve Messagee::RepositoryPushGrzegorz Bizon2015-12-081-61/+65
| | | |
| | * | Refactor RepositoryPush, move to Message namespaceGrzegorz Bizon2015-12-082-116/+120
| | | |
| | * | Extract repository_push_email to separate classGrzegorz Bizon2015-12-081-0/+116
| | | |
| * | | emoji aliases problemValery Sizov2015-12-111-0/+35
| | | |
* | | | Ensure that runners registration token is presentGrzegorz Bizon2015-12-111-1/+1
| | | |
* | | | Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-112-2/+6
|/ / /
* | | AuthHash should not parameterize email userCorey Hinshaw2015-12-101-1/+1
| |/ |/|
* | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-107-34/+107
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
| * | Allow [Symbol] when loading YAML Kamil Trzciński2015-12-091-2/+2
| | |
| * | Use YAML.safe_loadKamil Trzciński2015-12-091-2/+2
| | |
| * | Merge branch 'master' into split-up-buildsDouwe Maan2015-12-092-28/+37
| |\ \
| | * \ Merge branch 'master' into merge-if-greenDouwe Maan2015-12-092-1/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| | * \ \ Merge branch 'master' into merge-if-greenDouwe Maan2015-12-087-55/+106
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| | * \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-085-89/+12
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0737-282/+553
| | |\ \ \ \ \ \
| | * | | | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-022-14/+9
| | | | | | | | |
| | * | | | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-23/+13
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1864-524/+1964
| | |\ \ \ \ \ \ \
| | * | | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-22/+46
| | | | | | | | | |
| * | | | | | | | | Split up spec:other even moreDouwe Maan2015-12-091-1/+19
| | | | | | | | | |
| * | | | | | | | | Fix rspec tag syntaxDouwe Maan2015-12-091-1/+1
| | | | | | | | | |
| * | | | | | | | | Split up specs moreDouwe Maan2015-12-091-1/+10
| | | | | | | | | |
| * | | | | | | | | Split up feature specs moreDouwe Maan2015-12-091-3/+23
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Move Builds tab to the endDouwe Maan2015-12-081-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into mr-buildsDouwe Maan2015-12-088-56/+107
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
View Lorry Controller Status