summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Faster searchfaster_project_searchValery Sizov2016-11-084-18/+33
|
* Merge branch 'sh-bump-omniauth-gitlab' into 'master' Robert Speicher2016-11-083-3/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 As noted in gitlab-com/support-forum#1270, omniauth-gitlab fails if omniauth-oauth2 is bumped to 1.4.0, OAuth2 quietly fails due to https://github.com/linchus/omniauth-gitlab/issues/10: ``` 21:26:04 rails-web.1 | I, [2016-11-07T21:26:04.245007 #56637] INFO -- omniauth: (gitlab) Callback phase initiated. 21:26:05 rails-web.1 | E, [2016-11-07T21:26:05.068009 #56637] ERROR -- omniauth: (gitlab) Authentication failure! invalid_credentials: OAuth2::Error, invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. ``` This was fixed and discussed here: * https://github.com/linchus/omniauth-gitlab/commit/26c47e55396205fab8439363c98136d0fde797f3 * https://github.com/linchus/omniauth-gitlab/issues/10 Bumping this version to 1.0.2 will ensure future compatibility. See merge request !7348
| * Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-073-3/+7
| | | | | | | | Closes gitlab-com/support-forum#1270
* | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-0826-60/+230
|\ \ | | | | | | | | | | | | Use separate email-friendly token for incoming email See merge request !5914
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-0722-59/+184
| | | | | | | | | | | | reactivates all tests and writes more tests for it
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-0712-34/+79
| | | | | | | | | | | | email token be reset
* | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-082-9/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed todos empty state when filtering Closes #24127 See merge request !7334
| * | | Changed helper method to check for none on paramsPhil Hughes2016-11-082-6/+6
| | | | | | | | | | | | | | | | Moved if statements around in view
| * | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-072-8/+16
| | | | | | | | | | | | | | | | Closes #24127
* | | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-083-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix project index page See merge request !7331
| * | | | Fix 404 when visit /projects pagedz-fix-project-indexDmitriy Zaporozhets2016-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add tests for project#index routingDmitriy Zaporozhets2016-11-071-0/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-083-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Return 400 when creating a systemhook fails Closes #23335 See merge request !7350
| * | | | | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-083-1/+11
| | | | | |
* | | | | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern2016-11-087-14/+33
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
| * | | | | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| | | | | |
| * | | | | Fix bug of json request urlHiroyuki Sato2016-11-072-4/+11
| | | | | |
| * | | | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-063-13/+10
| | | | | |
| * | | | | Update changelogHiroyuki Sato2016-11-062-34/+4
| | | | | |
| * | | | | Fix spinach testHiroyuki Sato2016-11-062-1/+5
| | | | | |
| * | | | | Add a CHANGELOG entryHiroyuki Sato2016-11-061-0/+34
| | | | | |
| * | | | | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| | | | | |
| * | | | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-064-5/+10
| |/ / / /
* | | | | Merge branch 'change-docs-trigger-id' into 'master' Achilleas Pipinellis2016-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace trigger with the new ID of the docs project Now that the old docs site is deprecated in favor of https://gitlab.com/gitlab-com/gitlab-docs See merge request !7343
| * | | | | Replace trigger with the new ID of the docs projectAchilleas Pipinellis2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch '17492-link-contrast' into 'master' Annabel Dunstone Gray2016-11-074-16/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17492 Update link color for more accessible contrast ## What does this MR do? Improves contrast of links to pass accessibility contrast checker http://webaim.org/resources/contrastchecker/ ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-07_at_11.09.44_AM](/uploads/233c53cd81436a00f0cc7f826ca900df/Screen_Shot_2016-11-07_at_11.09.44_AM.png) After: ![Screen_Shot_2016-11-07_at_11.09.22_AM](/uploads/698ac990d61434893709a3cea78896d9/Screen_Shot_2016-11-07_at_11.09.22_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #17492 See merge request !7340
| * | | | | 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-074-16/+16
|/ / / / /
* | | | | 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
| | | | | | | |