summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken commits search24255-search-fixValery Sizov2016-11-087-2/+66
|
* Merge branch ↵Rémy Coutable2016-11-074-29/+25
|\ | | | | | | | | | | | | | | | | | | '23036-replace-git-blame-spinach-tests-with-rspec-feature-tests' into 'master' Rewritten spinach git_blame tests to RSpec feature tests Part of #23036. This MR contains 'git blame' feature tests rewritten in RSpec. See merge request !7197
| * Rewritten spinach git_blame tests to rspec feature testsLisanne Fellinger2016-11-074-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing rubocop violations Relocated git_blame spec and fixed styling issue Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Relocated git_blame spec and fixed styling issue Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Relocated git_blame spec and fixed styling issue
* | Merge branch '21664-incorrect-workhorse-version-number-displayed' into 'master' Rémy Coutable2016-11-074-1/+35
|\ \ | | | | | | | | | | | | | | | | | | Use the Gitlab Workhorse HTTP header in the admin dashboard Fixes issue #21664 where the GitLab Workhorse version displayed within the Admin Area was not correct for installations from source. See merge request !7332
| * | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-074-1/+35
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'cs-upgrade-redis-actionpack' into 'master' Rémy Coutable2016-11-072-17/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade redis-rails from 4.0.0 to 5.0.1. This updates redis-rails to 5.0.1 along with its dependencies. I helped upgrade redis-actionpack so it would work with both Rails 4.2 and 5.0 in the same version. Unfortunately none of the gems have Changelogs :/ - redis-rails: https://github.com/redis-store/redis-rails - redis-actionpack: https://github.com/redis-store/redis-actionpack - redis-activesupport: https://github.com/redis-store/redis-activesupport - redis-rack: https://github.com/redis-store/redis-rack - redis-store: https://github.com/redis-store/redis-store Working toward #14286. See merge request !7291
| * | | Upgrade redis-rails from 4.0.0 to 5.0.1.cs-upgrade-redis-actionpackConnor Shea2016-11-042-17/+17
| | | | | | | | | | | | | | | | This update adds support for Rails 5. Also update redis-rails dependencies.
* | | | Merge branch 'add-api-label-id' into 'master' Sean McGivern2016-11-074-90/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose Label id to API Closes #23448 See merge request !7275
| * | | | Expose Label id to APIRares Sfirlogea2016-11-074-90/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [e44da1c] Add Label API expected keys to tests [ac929c8] Update Label API documentation
* | | | | Merge branch 'process-commits-using-sidekiq' into 'master' Robert Speicher2016-11-0719-59/+565
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing Commits Using Sidekiq This moves the code of `GitPushService#process_commit_messages` into a separate Sidekiq worker. This allows processing of commits to happen in parallel, speeding up the process. See the individual commit (messages) for more information. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/15463 See merge request !6802
| * | | | | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-0711-51/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the code used for processing commits from GitPushService to its own Sidekiq worker: ProcessCommitWorker. Using a Sidekiq worker allows us to process multiple commits in parallel. This in turn will lead to issues being closed faster and cross references being created faster. Furthermore by isolating this code into a separate class it's easier to test and maintain the code. The new worker also ensures it can efficiently check which issues can be closed, without having to run numerous SQL queries for every issue.
| * | | | | Added IssueCollectionYorick Peterse2016-11-076-8/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to reduce a list of issues down to a subset based on user permissions. This class operates in such a way that it can reduce issues using as few queries as possible, if any at all.
| * | | | | Flush Housekeeping data from Redis specsYorick Peterse2016-11-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs use raw Redis objects which can not use the memory based caching mechanism used for tests. As such we have to explicitly flush the data from Redis before/after each spec to ensure no data lingers on.
| * | | | | Add the method ExternalIssue#project_idYorick Peterse2016-11-072-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method returns the project's ID, making ExternalIssue slightly more compatible with Issue (which also defines the "project_id" method).
| * | | | | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-072-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to retrieve a list of projects for a user that said user has reporter access to. This list is then be reduced down to a specific set of projects. This allows you to reduce a list of projects to a list of projects you have reporter access to in an efficient manner.
| * | | | | Added tests for IssuePolicyYorick Peterse2016-11-071-0/+119
| | | | | |
* | | | | | Merge branch 'missing-raw-snippet-access-spec' into 'master' Sean McGivern2016-11-073-59/+151
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing security specs for raw snippet access ## What does this MR do? It extends the project snippets access security specs to cover raw snippet paths as well. When I was researching snippets for !7256, I noticed that specs existed for the HTML show view of project snippets but not the raw view. Seeing as this is a spec that is checking for access regressions on places where sensitive information might be kept, I thought it would be a good idea to cover the raw snippets access too. To balance out the karma of adding in extra tests I also changed the tests to all use an `empty_project` spec. ## Are there points in the code the reviewer needs to double check? With the aim of making the specs easier to read, I restructured some of them to use context blocks for each type of snippet. I've used the same access rights defined for the show snippet paths for the raw snippet access. ## Why was this MR needed? To catch security regressions on raw snippet access for projects. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [-] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [-] [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 - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7300
| * | | | | Add missing security specs for raw snippet accessthe-undefined2016-11-053-59/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each project visibility type (Public, Internal, Private) has an access feature spec to catch security regressions. This commit adds relevent tests for the raw snippet path in each of these project access specs. Refacotrings: - Use an empty project factory for access specs
* | | | | | Merge branch '23034-speed-up-testenv-set-repo-refs' into 'master' Yorick Peterse2016-11-071-13/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `git update-ref --stdin -z` to speed up TestEnv.set_repo_refs See merge request !7283
| * | | | | | Use `git update-ref --stdin -z` to speed up TestEnv.set_repo_refsNick Thomas2016-11-071-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were calling `git update-ref <ref> <sha>` about 30 times per test using `create(:project)` or similar.
* | | | | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-0716-82/+408
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more than one kind of Git garbage collection Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :) Closes #22729 See merge request !7321
| * | | | | | Remove unused 'require'Jacob Vosmaer2016-11-041-1/+0
| | | | | | |
| * | | | | | Refine Git garbage collectionJacob Vosmaer2016-11-0416-82/+409
| | | | | | |
* | | | | | | Merge branch '24059-post-facto-fixups' into 'master' Douwe Maan2016-11-073-7/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixups to "Round-robin repository storage" ## What does this MR do? * Simplifies a method in application_settings.rb * Correctly marks a migration as needing downtime * Documents the requirement for renamed columns to be ## Are there points in the code the reviewer needs to double check? Should any of these changes be split out? Ideally we'd get this into the same point release as !7273 ## Why was this MR needed? Post-facto review of !7273 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to #24059 /cc @yorickpeterse @rspeicher See merge request !7287
| * | | | | | Simplify ApplicationSetting#repository_storagesNick Thomas2016-11-071-5/+1
| | | | | | |
| * | | | | | Renaming columns requires downtimeNick Thomas2016-11-072-2/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add-project-import-data-index' into 'master' Yorick Peterse2016-11-073-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an index for project_id in project_import_data to improve See merge request !7316
| * | | | | | Add an index for project_id in project_import_data to improveadd-project-import-data-indexStan Hu2016-11-063-1/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performance We see that many slow queries on GitLab.com are dominated by finding the project import data for a specific project. Adding an index is the most straightforward way of fixing this. Closes #23748
* | | | | | Merge branch 'refactor-issuable-form-template_selector' into 'master' Robert Speicher2016-11-074-44/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor template selector in issuable form CE brother of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/844 See merge request !7249
| * | | | | | Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-044-44/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'use_helper_method' into 'master' Rémy Coutable2016-11-072-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use method helper instead of add_template_helper On my opinion, better to use method `helper` instead of `add_template_helper`. Maybe there is reason doing it here. could you please explain if yes? Thanks! See merge request !7315
| * | | | | | | Use method helper instead of add_template_helperbogdanvlviv2016-11-062-8/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'api-priority-labels' into 'master' Rémy Coutable2016-11-075-29/+151
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposes the label priority to the API. Furthermore, it allows the user to modify the priority via the API. Closes #21269 See merge request !7286
| * | | | | | | Update label's API documentationRobert Schilling2016-11-071-10/+34
| | | | | | | |
| * | | | | | | Ability to update labels priority via APIRobert Schilling2016-11-074-19/+117
| |/ / / / / /
* | | | | | | Merge branch 'broken-link-frontend-dev-guide' into 'master' Rémy Coutable2016-11-072-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix broken link to observatory cli on Frontend Dev Guide See merge request !7317
| * | | | | | Fix broken link to observatory cli on Frontend Dev GuideSam Rose2016-11-062-1/+5
|/ / / / / /
* | | | | | Merge branch 'remove-diff-comments-spec-logging' into 'master' Fatih Acet2016-11-051-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logging to console in diff_comments_store_spec ## What does this MR do? Remove `console.log` from `diff_comments_store_spec.js.es6`. See merge request !7306
| * | | | | | Remove logging to console in diff_comments_store_specwinniehell2016-11-051-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'split-out-markdown-cache-update' into 'master' Yorick Peterse2016-11-051-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out markdown cache storage into a separate method See merge request !7277
| * | | | | | Split out markdown cache storage into a separate methodNick Thomas2016-11-041-1/+5
| | | | | | |
* | | | | | | Merge branch 'correct-spelling-andreesen' into 'master' Robert Speicher2016-11-051-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct spelling of Andreesen's name [ci skip] See merge request !7293
| * | | | | | Correct spelling of Andreesen's namecorrect-spelling-andreesenVictor Wu2016-11-041-1/+1
| | | | | | |
* | | | | | | Merge branch 'move-public-snippets-feature-to-rspec' into 'master' Robert Speicher2016-11-053-35/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Spinach public snippet feature test to RSpec feature See #23036 See merge request !7256
| * | | | | | | Move spinach public snippet feature to rspec specthe-undefined2016-11-043-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add rspec feature for public snippets - Remove spinach test for public snippets
* | | | | | | | Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0411-15/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update avatar container name so it doesnt conflict with other image containers Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular Before: ![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png) After: ![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png) cc @tauriedavis @dzaporozhets See merge request !7268
| * | | | | | | | Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-0311-15/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'add-special-char-tests-for-refs-dropdown' into 'master' Fatih Acet2016-11-041-1/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for refs dropdown selection with special chars ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7175
| * | | | | | | | | Created wait_for_turbolinks and added test for refs dropdown selection with ↵add-special-char-tests-for-refs-dropdownLuke "Jared" Bennett2016-11-041-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | special chars
* | | | | | | | | | Merge branch 'gitlab-workhorse-1.0.0' into 'master' Rémy Coutable2016-11-043-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v1.0.0, improving error handling This is an update to v1.0.0 - which does not signify any breaking changes, but is merely in accordance with http://semver.org/#how-do-i-know-when-to-release-100 See merge request !7289
View Lorry Controller Status