summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-3/+3
|/ / / / / /
* | | | | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-164-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix headers of milestone and snippet show pages Fix layout, and move "Edit" button to very right just like issue/MR. Before: ![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png) ![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png) After: ![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png) ![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2104
| * | | | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-164-6/+6
| | | | | |
* | | | | | Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-162-1/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add open_issues_count to project APIStan Hu2015-12-112-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | This is needed to support Huboard and a generally useful value.
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-3/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-161-3/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix time_ago_with_tooltip for activity feed Closes #4002 See merge request !2074
| | * | | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4002
* | | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1616-64/+65
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1516-64/+65
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1523-40/+40
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1523-40/+40
| |/ / / /
* | | | | Trigger notes refresh in specs instead of waiting for ajaxtests/note-pollingGrzegorz Bizon2015-12-151-1/+1
| | | | |
* | | | | Add minor fixes in note polling specsGrzegorz Bizon2015-12-151-4/+2
| | | | |
* | | | | Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
|/ / / / | | | | | | | | | | | | Ref. #4032, !2084
* | | | Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-142-34/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabled When user disables GitLab Ci Service in project's settings then warning about missing `.gitlab-ci.yml` file should be supressed. This a matter of user experience as stated in #3761 (closes #3761). cc @ayufan See merge request !2014
| * \ \ \ Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-1459-1810/+682
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
| * | | | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-141-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | Ref #3827
| * | | | | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-142-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This minimizes usage of instance variables in this spec, and changes double quotation marks to single when string interpolation is not being used.
| * | | | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabledGrzegorz Bizon2015-12-141-7/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | When user disables GitLab Ci Service in project's settings then warning about missing `.gitlab-ci.yml` file should be supressed. This a matter of user experience as stated in #3761 (closes #3761).
* | | | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
| | | | |
* | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-142-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Move CI admin builds and runners specs to correct directory Fix 500 when viewing specific runners on runners page Fix Ci::Project migration not migrating columns that cannot be NULL Fix MySQL migration of CI emails Minor fix in flow 'Merge when build succeeds'
| * | | | | Move CI admin builds and runners specs to correct directory [ci skip]Kamil Trzcinski2015-12-142-0/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1464-1820/+836
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1442-1125/+490
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Fix specsKamil Trzcinski2015-12-113-4/+5
| | | | | |
| | * | | | Fix after column renameKamil Trzcinski2015-12-115-16/+16
| | | | | |
| | * | | | Fix errorsKamil Trzcinski2015-12-113-4/+3
| | | | | |
| | * | | | Fix triggers testsKamil Trzcinski2015-12-112-19/+13
| | | | | |
| | * | | | Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+80
| | | | | |
| | * | | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1111-200/+199
| | | | | |
| | * | | | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| | | | | |
| | * | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1138-961/+253
| | | | | |
| * | | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1419-682/+189
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | | | | | | | | | | Ci Services migrate See merge request !1985
| | * | | Fix specsKamil Trzcinski2015-12-102-3/+3
| | | | |
| | * | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1019-682/+189
| | | | |
| * | | | Fix testsDmitriy Zaporozhets2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-111-7/+20
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
| * | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-113-6/+128
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
| | * | | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-081-3/+3
| | | | |
| | * | | Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| | | | |
| | * | | Add `RepositoryPush` specsGrzegorz Bizon2015-12-081-0/+122
| | | | |
| * | | | emoji aliases problemValery Sizov2015-12-111-0/+9
| | | | |
* | | | | Stub also `ensure_*` method in CI runners API specsci/persist-registration-tokenGrzegorz Bizon2015-12-111-0/+1
| | | | |
* | | | | Ensure that runners registration token is presentGrzegorz Bizon2015-12-111-1/+1
| | | | |
* | | | | Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-111-1/+8
| | | | |
* | | | | Add specs for feature that regenerates runners tokenGrzegorz Bizon2015-12-111-0/+22
| | | | |
* | | | | Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-111-3/+6
| | | | |
* | | | | Add specs for `TokenAuthenticatable` concernGrzegorz Bizon2015-12-111-0/+50
|/ / / /