summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | emoji picker: minor fixesValery Sizov2015-12-221-8/+0
| | | | | | |
* | | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-9/+40
|/ / / / / /
* | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+17
|\ \ \ \ \ \
| * | | | | | add CAS authentication supporttduehr2015-12-141-0/+17
| | | | | | |
* | | | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show git version on admin page Before ![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png) After ![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png) gitlab-org/gitlab-ce#4077 See merge request !2101
| * | | | | | | Show git version on admin pageTrey Davis2015-12-151-0/+4
| |/ / / / / /
* | | | | | | Backport JIRA serviceDrew Blessing2015-12-182-4/+28
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-161-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
| * | | | | | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4112
* | | | | | | Merge branch 'fix_rubocop' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix Rubocop complain. See merge request !2125
| * | | | | | Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
| | | | | | |
* | | | | | | Merge branch 'disable-markdown-cache' into 'master' Douwe Maan2015-12-161-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily disable Markdown caching See merge request !2120
| * | | | | | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-164-292/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'workhorse-passthrough' into 'master' Kamil Trzciński2015-12-164-292/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass all requests from NGINX to gitlab-workhorse See merge request !2073
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jacob Vosmaer2015-12-1523-352/+162
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | workhorse-passthrough
| | * | | | | | Update init script options for gitlab-workhorseJacob Vosmaer2015-12-152-2/+3
| | | | | | | |
| | * | | | | | Pass all requests from NGINX to gitlab-workhorseJacob Vosmaer2015-12-112-290/+3
| | | | | | | |
* | | | | | | | Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add open_issues_count to project APIStan Hu2015-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to support Huboard and a generally useful value.
* | | | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1613-16/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1513-16/+21
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1554-421/+471
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Markdown/reference logic from `Gitlab::Markdown` to `Banzai` - Moves from `Gitlab::Markdown` to `Banzai` - Moves filters and pipelines into their own namespace: `Banzai::Filter` and `Banzai::Pipeline` - No more `autoload`! - Split up `Gitlab::ReferenceExtractor` into `Banzai::ReferenceExtractor` and `Gitlab::ReferenceExtractor` - Replace `something(load_lazy_references: true)` by `Gitlab::ReferenceExtractor.lazily { something }` Goes from: ```ruby def referenced_merge_requests references = [self, *notes].flat_map do |note| note.all_references(load_lazy_references: false).merge_requests end.uniq! Gitlab::Markdown::ReferenceFilter::LazyReference.load(references).uniq.sort_by(&:iid) end ``` to ```ruby def referenced_merge_requests Gitlab::ReferenceExtractor.lazily do [self, *notes].flat_map do |note| note.all_references.merge_requests end end.sort_by(&:iid) end ``` See merge request !2027
| * | | | | | | | 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 'add_user_repo_integrity_rake_task' into 'master' Robert Speicher2015-12-151-4/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user repository integrity check rake task Corrupt repositories and stuck lock files can cause weird issues in GitLab. Often we know which user is having these problems and then we have to go hunt down which repository is causing it. Several times recently that involved me running queries in the rails console to get an array of projects and then writing a quick Ruby script to loop through and run `git fsck`. This last time I also had to check for the existence of `config.lock` and ref lock files. This rake task will eliminate all of those steps and allow an admin to simply specify a username. I also added the lock file checks to the existing `gitlab:repo:check` task which goes through all projects. See merge request !2080
| * | | | | | | [ci skip] Add user repository integrity check rake taskDrew Blessing2015-12-141-4/+52
| | |/ / / / / | |/| | | | |
* | | | | | | 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
| | | | | | | | |