summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor `find_for_git_client` and its related methods.2fa-check-git-httpPatricio Cano2016-08-181-20/+25
|
* Refactor `find_for_git_client` method to not use assignment in conditionals ↵Patricio Cano2016-08-174-27/+37
| | | | and syntax fixes.
* Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-162-10/+16
|
* Added better information about the personal tokensPatricio Cano2016-08-162-2/+5
|
* 2FA check is now done in the main GitHTTPClientControllerPatricio Cano2016-08-161-0/+7
|
* Added CHANGELOG itemPatricio Cano2016-08-161-0/+1
|
* Deny Git over HTTP access to users that have 2FA enabled, unless they use a ↵Patricio Cano2016-08-162-0/+45
| | | | Personal Access Token.
* Allow Git over HTTP access using Personal Access TokensPatricio Cano2016-08-161-0/+9
|
* Revert "Merge branch ↵Rubén Dávila Santos2016-08-162-159/+10
| | | | | '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" This reverts merge request !5417
* Merge branch '19350-product-map' into 'master' Jacob Schatz2016-08-161-5/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to product map. ## What does this MR do? Mention the product map in the UI Guide and remove a line that says that the GitLab logo and user picture and in the sidebar. ## What are the relevant issue numbers? 19350 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19350 See merge request !5769
| * Add reference to product map. 19350-product-mapChris Peressini2016-08-111-5/+11
| | | | | | | | Remove line that says the GitLab logo and user picture are in the sidebar.
* | Merge branch 'cs-upgrade-httpclient' into 'master' Stan Hu2016-08-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Fixes deprecation warnings from Ruby 2.3. Resolves #20950. Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282 cc: @stanhu See merge request !5816
| * | Upgrade httpclient gem from 2.7.0.1 to 2.8.2.Connor Shea2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | Fixes deprecation warnings from Ruby 2.3. Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282
* | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-1535-159/+583
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
| * | | Further refactor and syntax fixes.Patricio Cano2016-08-1520-169/+160
| | | |
| * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-1518-229/+200
| | | | | | | | | | | | | | | | - Refactored SpamCheckService into SpamService
| * | | Added Documentation and CHANGELOGPatricio Cano2016-08-154-0/+24
| | | |
| * | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-1513-10/+129
| | | | | | | | | | | | | | | | | | | | - Added controller actions as reusable concerns - Added controller tests
| * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-158-5/+51
| | | | | | | | | | | | | | | | | | | | - Added `submitted_as_ham` to `SpamLog` to mark which logs have been submitted to Akismet. - Added routes and controller action.
| * | | Refactored spam related code even furtherPatricio Cano2016-08-1515-93/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unnecessary column from `SpamLog` - Moved creation of SpamLogs out of its own service and into SpamCheckService - Simplified code in SpamCheckService. - Moved move spam related code into Spammable concern
| * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-1510-38/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Merged `AkismetSubmittable` into `Spammable` - Clean up `SpamCheckService` - Added tests for `Spammable` - Added submit (ham or spam) options to `AkismetHelper`
| * | | Lay the ground works to submit information to AkismetPatricio Cano2016-08-1510-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | - New concern `AkismetSubmittable` to allow issues and other `Spammable` models to be submitted to Akismet. - New model `UserAgentDetail` to store information needed for Akismet. - Services needed for their creation and tests.
* | | | Merge branch ↵Robert Speicher2016-08-152-10/+159
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master' Add rspec feature tests for the diff notes feature. ## What are the relevant issue numbers? Closes #19957. See merge request !5417
| * | | Review changes19957-write-tests-for-adding-comments-for-different-line-types-in-diffLuke Bennett2016-08-101-43/+23
| | | |
| * | | Moved notes scenarios to 'diff_notes_spec.rb'Luke Bennett2016-08-053-180/+179
| | | |
| * | | Finished css replacement of xpath selectors and tidying up specLuke Bennett2016-07-251-16/+15
| | | |
| * | | Tidying up spec for new implementation of css ID selectorsLuke Bennett2016-07-251-22/+38
| | | |
| * | | Fixed failing tests with WaitForAjaxLuke "Jared" Bennett2016-07-251-0/+3
| | | |
| * | | Finished up intial version that uses XPath extensivelyLuke "Jared" Bennett2016-07-251-126/+109
| | | |
| * | | Added new spec descriptions and scenariosLuke "Jared" Bennett2016-07-251-0/+169
| | | |
* | | | Merge branch 'fix-failing-tests' into 'master' Douwe Maan2016-08-153-7/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a long running tests due to changed Sidekiq state ## What does this MR do? Fixes a ordering of tests problem, where GroupsController tests change global state and this affects IrkerService cc @connorshea See merge request !5819
| * | | | Make rubocop happyKamil Trzcinski2016-08-151-9/+9
| | | | |
| * | | | This fixes a long running tests due to changed Sidekiq statefix-failing-testsKamil Trzcinski2016-08-153-14/+17
| | | | |
* | | | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-157-4/+162
|\ \ \ \ \
| * | | | | Prevents accidental overwrites of commits from UIFrank West2016-08-157-4/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when a user performs an update of a file through the UI and there has already been a change committed to the file the previous commits will be overwritten without a check to see if the file has been changed. This commit uses the last commit sha at the time the user starts editing the file and compares it with the current sha of the file being edited to ensure they are the same before committing the file. If the shas do not match we throw an exception preventing the commit from the commit from occurring. Fixes #5857
* | | | | | Merge branch '20317-admin-cant-order-by-size' into 'master' Robert Speicher2016-08-151-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to sort by project size on admin projects page Fixes #20317 See merge request !5797
| * | | | | Restore `Largest repository` sort option on admin projects page20317-admin-cant-order-by-sizeAlfredo Sumaran2016-08-151-1/+7
|/ / / / /
* | | | | Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-1527-177/+807
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test coverage badge ## What does this MR do? This MR adds a test coverage badge. Test coverage badge will be a SVG image you can embed in README.md or on your website that will be created dynamically by GitLab, to show information about how much of the code is being covered by tests. In addition to coverage-regexp feature we currently have, this feature will make it possible to use the coverage data obtained from the build log. We will support both - pipeline coverage, or test coverage for particular job in the pipeline. ![coverage_badges](/uploads/dfa307339eb58c8138e551b42c0d8756/coverage_badges.png) ![coverage_badge](/uploads/30406e4bdcf979b2900ffe8996728c97/coverage_badge.png) ## What are the relevant issue numbers? Closes #3714 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5708
| * | | | | Add Changelog entry for test coverage report badgefeature/test-coverage-badgeGrzegorz Bizon2016-08-151-0/+1
| | | | | |
| * | | | | Add documentation for test coverage report badgeGrzegorz Bizon2016-08-152-10/+37
| | | | | |
| * | | | | Add feature specs for test coverage badgeGrzegorz Bizon2016-08-151-0/+73
| | | | | |
| * | | | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-152-5/+5
| | | | | |
| * | | | | Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| | | | | |
| * | | | | Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| | | | | |
| * | | | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-153-39/+67
| | | | | |
| * | | | | Add method for coverage badge in badges controllerGrzegorz Bizon2016-08-151-2/+15
| | | | | |
| * | | | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-152-0/+20
| | | | | |
| * | | | | Extract base abstract template for badgesGrzegorz Bizon2016-08-153-35/+51
| | | | | |
| * | | | | Add template class for coverage report badgeGrzegorz Bizon2016-08-152-0/+199
| | | | | |
| * | | | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-155-22/+54
| | | | | |
View Lorry Controller Status