summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1661-167/+199
|\
| * Fixed CiServices validationfeature/update-rubocopGabriel Mazetto2015-12-152-4/+4
| |
| * Disabled Rails/Date copGabriel Mazetto2015-12-151-0/+6
| |
| * Fixed Rubocop offensesGabriel Mazetto2015-12-1558-154/+155
| |
| * Updated .rubocop.yml to match 0.35.x changesGabriel Mazetto2015-12-141-6/+30
| |
| * Updated Rubocop to latest versionGabriel Mazetto2015-12-142-7/+8
| |
* | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1584-495/+546
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-6/+6
| | |
| * | Banzai::XFilter -> Banzai::Filter::XFilterDouwe Maan2015-12-153-4/+4
| | |
| * | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1584-491/+542
| | |
* | | Merge branch 'add_user_repo_integrity_rake_task' into 'master' Robert Speicher2015-12-154-5/+117
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-144-5/+117
| | | |
* | | | Merge branch 'wider-layout' into 'master' Andrey2015-12-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase fixed layout width to 1280px Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @creamzy See merge request !2075
| * | | | Increase fixed layout width to 1280pxwider-layoutDmitriy Zaporozhets2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-panel-height' into 'master' Dmitriy Zaporozhets2015-12-151-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inline panel heading height The `line-height` was added so that headings in the panels on the settings page had the same height as headings elsewhere, but the style applied everywhere :) Before: (Look at the "Unstarted Issues" heading) ![Screen_Shot_2015-12-15_at_17.39.46](/uploads/9dbea4c8b28e3c43bb5d4b5226d7a1ec/Screen_Shot_2015-12-15_at_17.39.46.png) ![Screen_Shot_2015-12-15_at_17.40.19](/uploads/97898418e9a66954c02e8a68b21c08b9/Screen_Shot_2015-12-15_at_17.40.19.png) After: ![Screen_Shot_2015-12-15_at_17.40.45](/uploads/5748aba032889053dd778b39e96fa301/Screen_Shot_2015-12-15_at_17.40.45.png) ![Screen_Shot_2015-12-15_at_17.40.40](/uploads/20240cdc7a6d5665cd32556d1a0e6c1d/Screen_Shot_2015-12-15_at_17.40.40.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2106
| * | | | | Fix inline panel heading heightDouwe Maan2015-12-151-1/+4
|/ / / / /
* | | | | Merge branch 'tests/note-polling' into 'master' Grzegorz Bizon2015-12-155-2/+34
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature specs for note polling Ref. #4032, !2084 cc @rspeicher See merge request !2086
| * | | | Trigger notes refresh in specs instead of waiting for ajaxtests/note-pollingGrzegorz Bizon2015-12-151-1/+1
| | | | |
| * | | | Assign notes object to a variableGrzegorz Bizon2015-12-151-1/+1
| | | | |
| * | | | Add minor fixes in note polling specsGrzegorz Bizon2015-12-151-4/+2
| | | | |
| * | | | Add spinach test for note pollingGrzegorz Bizon2015-12-153-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
| * | | | Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
|/ / / / | | | | | | | | | | | | Ref. #4032, !2084
* | | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note polling Closes #4032 See merge request !2084
| * | | | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | Closes #4032
* | | | | Merge branch 'preserve-trailing-new-lines-at-eof' into 'master' Robert Speicher2015-12-144-2/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve trailing new lines at the end of file on the online editor Fixes #3784 Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up. See merge request !2099
| * | | | | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-144-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up.
* | | | | | Merge branch 'contributing_md' into 'master' Achilleas Pipinellis2015-12-141-118/+266
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up CONTRIBUTING.md * Use 80 chars width where possible * Remove easyfix label reference * Add new issue submission template * Add long links to the bottom of the page See merge request !2100
| * | | | | Fix links [ci skip]contributing_mdAchilleas Pipinellis2015-12-151-8/+10
| | | | | |
| * | | | | Clean up CONTRIBUTING.md [ci skip]Achilleas Pipinellis2015-12-151-113/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use 80 chars width where possible * Remove easyfix label reference * Add new issue submission template * Add long links to the bottom of the page
| * | | | | Clarify what CE and EE means for newcomersAchilleas Pipinellis2015-12-141-1/+6
|/ / / / /
* | | | | Merge branch 'feature-proposal' into 'master' Achilleas Pipinellis2015-12-142-14/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update guides for feature proposals on the issue tracker see also #4038 cc @sytses See merge request !2094
| * | | | | move up text regarding where to post issuefeature-proposalJob van der Voort2015-12-141-1/+2
| | | | | |
| * | | | | update guides for feature proposals on the issue trackerJob van der Voort2015-12-142-14/+51
| | | | | |
* | | | | | Merge branch 'fix-typo-mailing-list' into 'master' Robert Schilling2015-12-141-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Typo [mailinglist to mailing list] Closes: #4078 See merge request !2098
| * | | | | Fix Typo [mailinglist to mailing list]Mrinal2015-12-141-2/+2
|/ / / / /
* | | | | Update 8.2-to-8.3 guideRobert Speicher2015-12-141-8/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'add-upgrade-guide-for-8-3' into 'master' Robert Speicher2015-12-141-0/+187
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upgrade guide for 8.2 to 8.3 Making sure we don't forget mentioning the need to upgrade Redis from !1888. Added this in preparation for 8.3. [ci skip] See merge request !2085
| * | | | | Update gitlab-workhorse and remove mention of gitlab-git-http-serverStan Hu2015-12-141-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Rename gitlab-git-http-server mention with gitlab-workhorseStan Hu2015-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add upgrade guide for 8.2 to 8.3Stan Hu2015-12-141-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Prepare Installation doc for 8.3.0-rc1Robert Speicher2015-12-141-34/+39
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-149-39/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Update CHANGELOGux/suppress-ci-yml-warningGrzegorz Bizon2015-12-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update commits spinach tests related to displaying build statusGrzegorz Bizon2015-12-142-1/+6
| | | | | |
| * | | | | Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-14233-4628/+2053
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-144-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref #3827
| * | | | | | Add matcher class to ci status linkGrzegorz Bizon2015-12-141-1/+1
| | | | | | |
| * | | | | | 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).
* | | | | | | Merge branch 'ci/persist-registration-token' into 'master' Grzegorz Bizon2015-12-1414-27/+158
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist CI runners registration token This MR adds feature of persisting CI runners registration token. User will be able to generate and then reset (if necessary to revoke) this token. This closes #3703 cc @ayufan See merge request !2039