summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* fix spacingfix/encoding-binary-issueJames Lopez2017-06-061-1/+1
|
* fix spacing and wordingJames Lopez2017-06-061-3/+3
|
* add spec to replicate encoding problemJames Lopez2017-06-061-2/+13
|
* Resolve "When changing project visibility setting, change other dropdowns ↵Mike Greiling2017-06-063-5/+5
| | | | automatically"
* Merge branch 'issue-23254' into 'master'Rémy Coutable2017-06-061-2/+2
|\ | | | | | | | | Cleanup style of confirmation page See merge request !11774
| * Fixed style on unsubscribe pageGustav Ernberg2017-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | Removed unnecassary logic Added missing 'the' Fix case Fixed specs
* | Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-061-0/+70
|\ \ | | | | | | | | | | | | | | | | | | Add a Rake task to aid in rotating otp_key_base Closes #29690 See merge request !11881
| * | Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-051-0/+70
| | |
* | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-057-28/+71
|\ \ \ | | | | | | | | | | | | | | | | backports changed import logic from pull mirroring feature into CE See merge request !11850
| * | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-057-28/+71
| | | |
* | | | Fix header component spec33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-fooClement Ho2017-06-051-1/+4
| | | |
* | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-057-381/+710
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Git-over-HTTP rejections See merge request !11398
| * | | | Refactor to remove a special caseMichael Kozono2017-06-051-0/+15
| | | | |
| * | | | Clarify error messagesMichael Kozono2017-06-052-5/+5
| | | | | | | | | | | | | | | | | | | | And refactor to self-document a little better.
| * | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-053-123/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
| * | | | Specify new Git-LFS-over-HTTP behaviorMichael Kozono2017-06-051-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to `GitHttpClientController`’s authentication logic caused this behavior change. The old 401 Unauthorized statuses didn’t cause any harm, but they weren’t quite as accurate as the new behavior.
| * | | | Move CI access logic into GitAccessMichael Kozono2017-06-053-29/+166
| | | | |
| * | | | RefactorMichael Kozono2017-06-051-6/+6
| | | | |
| * | | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-1/+42
| | | | |
| * | | | Fix Git over HTTP specMichael Kozono2017-06-052-253/+382
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The spec has 7 failures at this point * Specify rendered error messages * Render the GitAccess message rather than “Access denied” * Render the Not Found message provided by GitAccess, instead of a custom one * Expect GitAccess to check the config for whether Git-over-HTTP pull or push is disabled, rather than doing it in the controller * Add more thorough testing for authentication * Dried up a lot of tests * Fixed some broken tests
* | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-054-7/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
| * | | | Allow users to be hard-deleted from the admin user show pageNick Thomas2017-06-051-0/+3
| | | | |
| * | | | Allow users to be hard-removed from the admin users list pageNick Thomas2017-06-051-1/+2
| | | | |
| * | | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-2/+13
| | | | |
| * | | | Refactor the DeleteUserWorkerNick Thomas2017-06-052-4/+2
| |/ / /
* | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-051-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport EE refactorings for Protected Tag EE-only functionality See merge request !11125
| * | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* | | | | Merge branch ↵Douwe Maan2017-06-051-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboard' into 'master' Use last_activity_at attr when showing the update date in project listing Closes #32869 See merge request !11896
| * | | | | Use last_activity_at attr when showing the update date in project listing32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboardRuben Davila2017-06-031-0/+9
| | | | | |
* | | | | | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-051-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix submodule link to then project under subgroup Closes gitlab-ee#2411 See merge request !11906
| * | | | | | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-051-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change only last namespace in full path was extracted. It's fine unless you have a link to submodule under subgroups. In that case self_url? method returns false and link is processed as external. I could not find a proper regex to cover all cases and correctly extract full path to repository and instead used current instance host name to get correct path to namespace and project. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch '33154-permissions-for-project-labels-and-group-labels' into ↵Douwe Maan2017-06-051-3/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Permissions for project labels and group labels" Closes #33154 See merge request !11876
| * | | | | | Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labelsSean McGivern2017-06-051-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only group masters could do this. However, project reporters can manage project labels, so there doesn't seem to be any need to restrict group labels further. Also, save a query or two by getting a single GroupMember object to find out if the user is a master or not.
* | | | | | | Merge branch ↵Douwe Maan2017-06-055-18/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master' Increase diff limits to 100 KB for collapse and 200 KB overall Closes #31983 See merge request !11875
| * | | | | | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-openingSean McGivern2017-06-025-18/+43
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is controlled with the feature flag gitlab_git_diff_size_limit_increase. Both of these limits were basically picked arbitrarily in the first place; disabling the feature flag reverts to the old limits.
* | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-055-4/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-02145-643/+4080
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | | | | | | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated_at_by variable in issuable_app_data
| * | | | | | | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-0/+26
| | | | | | | |
| * | | | | | | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-21/+18
| | | | | | | |
| * | | | | | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-2/+2
| | | | | | | |
| * | | | | | | Review changes, improve editable helper spec and add hasUpdated computer to ↵Luke "Jared" Bennett2017-05-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_show app Fix builds by only merge when updated_at_by is presnse Fix issue_show app.vue hasUpdated reference to state Fix missing bracket
| * | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-315-4/+105
| | | | | | | |
* | | | | | | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | | | | | | Add slugify project path to CI enviroment variablesvanadium232017-06-031-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-059-61/+272
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | | | | | | | | Fix test failuresKamil Trzcinski2017-06-033-5/+5
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0284-529/+2435
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-023-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add minor changed needed to pass review
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-0119-15/+310
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status