summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove /featuresblackst0ne2018-05-1432-1989/+0
|
* Increase rspec jobs up to 30blackst0ne2018-05-141-115/+123
|
* Fix specsblackst0ne2018-05-141-0/+9
|
* Add changelog entry [ci skip]blackst0ne2018-05-141-0/+5
|
* Revert clean up `db/fixtures/development/14_pipelines.rb`blackst0ne2018-05-141-0/+4
|
* Clean up test.rakeblackst0ne2018-05-141-1/+0
|
* Remove spinach.rakeblackst0ne2018-05-141-60/+0
|
* Clean up spec/support/gitlab_stubs/gitlab_ci.ymlblackst0ne2018-05-141-9/+0
|
* Clean up 14_pipelines.rbblackst0ne2018-05-141-4/+0
|
* Clean up docsblackst0ne2018-05-148-47/+6
|
* Clean up gitlab-ci.ymlblackst0ne2018-05-141-57/+1
|
* Remove bin/spinachblackst0ne2018-05-141-13/+0
|
* Clean up Gemfileblackst0ne2018-05-142-20/+0
|
* Clean up `notes_controller`blackst0ne2018-05-141-13/+0
|
* Merge branch ↵Rémy Coutable2018-05-146-215/+71
|\ | | | | | | | | | | | | 'blackst0ne-replace-spinach-project-forked-merge-requests.feature' into 'master' Replace the `project/forked_merge_requests.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18867
| * Replace the `project/forked_merge_requests.feature` spinach test with an ↵blackst0ne2018-05-146-215/+71
|/ | | | rspec analog
* Merge branch '46164-remove-redundant-tooltips' into 'master'Phil Hughes2018-05-141-1/+1
|\ | | | | | | | | | | | | Resolve "Remove redundant tooltips on activity tabs" Closes #46164 See merge request gitlab-org/gitlab-ce!18918
| * Remove tooltips on activity tabsAnnabel Dunstone Gray2018-05-111-1/+1
| |
* | Merge branch ↵Rémy Coutable2018-05-148-410/+249
|\ \ | | | | | | | | | | | | | | | | | | 'blackst0ne-replace-spinach-project-commits-diff-comments.feature' into 'master' Replace the `project/commits/diff_comments.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18868
| * | Replace the `project/commits/diff_comments.feature` spinach test with an ↵blackst0ne2018-05-148-410/+249
|/ / | | | | | | rspec analog
* | Merge branch 'docs/rs-errant-grave' into 'master'Achilleas Pipinellis2018-05-141-1/+1
|\ \ | |/ |/| | | | | Remove an extra backtick from Group Milestones API documentation See merge request gitlab-org/gitlab-ce!18913
| * Remove an extra backtick from Group Milestones API documentationRobert Speicher2018-05-111-1/+1
| |
* | Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-111-5/+0
|\ \ | | | | | | | | | | | | Remove duplicate method See merge request gitlab-org/gitlab-ce!18886
| * | Remove duplicate methodRubén Dávila2018-05-101-5/+0
| | |
* | | Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-112-2/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow a user to sign out when on the terms page Closes #46211 See merge request gitlab-org/gitlab-ce!18875
| * | | Allow a user to sign out when on the terms pageBob Van Landuyt2018-05-112-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we would block the `sign_out` request when the user did not accept the terms, therefore redirecting them to the terms again. By allowing all request to devise controllers, we avoid this problem.
* | | | Merge branch ↵Robert Speicher2018-05-111-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'b-rails5-fix-spec-controllers-projects-jobs_controller_spec-rb' into 'master' Resolve "[Rails5] Fix spec/controllers/projects/jobs_controller_spec.rb" Closes #46227 See merge request gitlab-org/gitlab-ce!18891
| * | | | [Rails5] Fix spec/controllers/projects/jobs_controller_spec.rbb-rails5-fix-spec-controllers-projects-jobs_controller_spec-rbblackst0ne2018-05-111-12/+12
| |/ / / | | | | | | | | | | | | | | | | In Rails 5.0 `response.content_type` does not return charset which is expected in specs. This commit replaces `response.content_type` with `response.headers["Content-Type"]` in specs.
* | | | Merge branch ↵Robert Speicher2018-05-117-131/+65
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 'blackst0ne-replace-spinach-project-merge-requests-references.feature' into 'master' Replace the `project/merge_requests/references.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18794
| * | | Replace `features/project/merge_requests/references.featue`blackst0ne-replace-spinach-project-merge-requests-references.featureblackst0ne2018-05-106-131/+60
| | | |
| * | | Add changelog entry [ci skip]blackst0ne2018-05-101-0/+5
| | | |
* | | | Merge branch 'docs/microsoft-teams' into 'master'Lin Jen-Shin2018-05-111-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master' See merge request gitlab-org/gitlab-ce!18908
| * | | | Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master'Achilleas Pipinellis2018-05-111-3/+3
|/ / / / | | | | | | | | | | | | | | | | Fix: API Documentation typo on Microsoft Teams slug See merge request gitlab-org/gitlab-ee!5412
* | | | Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-112-0/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce terms acceptance before configuring 2FA Closes #46256 See merge request gitlab-org/gitlab-ce!18896
| * | | | Enforce terms acceptance before other requirementsBob Van Landuyt2018-05-112-0/+106
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This prevents a redirect loop when a user has to enable 2FA and accept the terms. Now they will need to accept the terms, then enable 2FA, or any other requirements.
* | | | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-1115-28/+429
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block access to API & git when terms are enforced Closes #45849 See merge request gitlab-org/gitlab-ce!18816
| * | | | Allow triggered builds git accessBob Van Landuyt2018-05-115-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | Allow builds that have been triggered by a user before terms were enforced access to git. That way the builds can complete as usual.
| * | | | Allows `access_(git|api)` to anonymous usersBob Van Landuyt2018-05-102-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `access_git` and `access_api` were currently never checked for anonymous users. And they would also be allowed access: An anonymous user can clone and pull from a public repo An anonymous user can request public information from the API So the policy didn't actually reflect what we were enforcing.
| * | | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-1012-21/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms.
* | | | | Merge branch 'vendor-auto-devops-template' into 'master'Kamil Trzciński2018-05-111-36/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Vendor Auto DevOps template See merge request gitlab-org/gitlab-ce!18876
| * | | | | Vendor Auto DevOps templateFabio Busatto2018-05-111-36/+18
|/ / / / /
* | | | | Merge branch '45715-remove-modal-retry' into 'master'Phil Hughes2018-05-119-241/+124
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove modal box confirmation when retrying a pipeline" Closes #45715 See merge request gitlab-org/gitlab-ce!18879
| * | | | | Resolve "Remove modal box confirmation when retrying a pipeline"Filipa Lacerda2018-05-119-241/+124
|/ / / / /
* | | | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-112-36/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitlab::RepoPath.strip_storage_path See merge request gitlab-org/gitlab-ce!18904
| * | | | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-112-36/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This used to be executed because of the post receive worker, but this uses Gitlab::GlRepository.parse now. So this removes dead code and reduces the number of calls on `#legacy_storage_path`.
* | | | | | Merge branch 'dz-add-2fa-filter' into 'master'Douwe Maan2018-05-118-15/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 2FA filter to group members page See merge request gitlab-org/gitlab-ce!18483
| * | | | | | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-108-15/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show 2fa badge on a group members page * Make group members page UI consistent with project members page * Fix ambiguous sql in User.with/without_two_factor methods Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-112-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki Find Page to opt_out Closes gitaly#894 See merge request gitlab-org/gitlab-ce!18895
| * | | | | | | Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-112-1/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/894
* | | | | | | Merge branch 'blackst0ne-rails5-bump-rails5-to-5-0-7' into 'master'Douwe Maan2018-05-112-63/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Rails5] Bump Rails5 to 5.0.7" Closes #46234 See merge request gitlab-org/gitlab-ce!18888
View Lorry Controller Status