Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
AgeCommit message (Collapse)Author
2016-11-24Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [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 - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
2016-11-24Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
2016-11-24Merge branch 'simplify-create-new-list-issue-boards' into 'master' Annabel Dunstone Gray
Simplify copy on "Create a new list" dropdown in Issue Boards ## What does this MR do? It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659. ## Are there points in the code the reviewer needs to double check? Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified: File: `doc/user/project/issue_board.md` ``` In short, here's a list of actions you can take in an Issue Board: - [Create a new list](#creating-a-new-list). - [Delete an existing list](#deleting-a-list). ``` because I was not sure if changing those was necessary. Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly. File: `spec/features/boards/boards_spec.rb` ## Why was this MR needed? It is an improvement, as suggested in #24659 ## Screenshots (if relevant) **Before:** ![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png) **After:** ![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [X] [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 - [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? #24659 See merge request !7605
2016-11-24Merge branch 'move-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable
Move abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7659
2016-11-23Merge branch 'fix-lfs-enabled-select-box' into 'master' Stan Hu
Fix `LFS enabled` select box. A refactor of the project edit page caused the `lfs_enabled` setting to be reverted to a non functioning state. This MR fixes that. This will most likely need to be ported back to 8.13 and 8.14. 8.12 contained the correct code. Fixes #24645 Related commits: - ea3bbbdef86ae30fcf76baaba11a3fceb6d2aa03 - da07c2e4d3d382c05ec287ee60f639b870074fe7 cc @stanhu @dblessing @dbalexandre @rymai See merge request !7716
2016-11-23Added test that checks the correct select box is there for the LFS enabled ↵Patricio Cano
setting.
2016-11-23Simplify copy on "Create a new list" dropdown in Issue Boardsvrod
2016-11-23Use Commit#author so we share logic and cacheLin Jen-Shin
Closes #24900
2016-11-23Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran
move timeago.js to vendor directory ## What does this MR do? moves timeago.js into `/vendor/assets/javascripts` for consistency with other external javascript libraries. ## Are there points in the code the reviewer needs to double check? make sure timeago still works as it should...? I don't see how this could have broken anything. ## Why was this MR needed? consistency with our guidelines ## Does this MR meet the acceptance criteria? - Tests - [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? See discussion in [!6274](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6274#note_18625583) See merge request !7590
2016-11-23Move admin abuse report spinach test to rspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23Merge branch 'api-delete-group-share' into 'master' Rémy Coutable
API: Add endpoint to delete a group share Closes #24771 See merge request !7662
2016-11-23Move abuse report spinach test to rspecSemyon Pupkov
part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24863 See merge request !7698
2016-11-23Merge branch 'milestone_start_date' into 'master' Sean McGivern
Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
2016-11-23Merge branch 'post_receive-any-email' into 'master' Sean McGivern
post_receive: accept any user email from last commit See merge request !7225
2016-11-23Add nested groups support to the routingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-23Correctly determine mergeability of MR with no discussionsDouwe Maan
2016-11-23API: Add endpoint to delete a group shareRobert Schilling
2016-11-23Add a starting date to milestonesValery Sizov
2016-11-23Update ProjectTeam#fetch_members to use project authorizationsAhmad Sherif
2016-11-23Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif
2016-11-23Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif
Closes #23938
2016-11-23Merge branch 'remove-empty-describe-block' into 'master' Rémy Coutable
Remove empty describe block in service spec See merge request !7669
2016-11-23Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan
Fix cycle analytics plan stage when commits are missing Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836 - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7694
2016-11-23Fix and relevant spec for plan stage breaking with nil commitsJames Lopez
2016-11-23Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher
Fix Sidekiq stats in admin area Closes #23825, #24675 See merge request !7654
2016-11-23timeago should be a dependency of datetime_utilityMike Greiling
2016-11-23Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran
Clean up globals exemptions within .eslintrc ## What does this MR do? Removes unnecessarily-exempted globals from `.eslintrc` where possible. ## Are there points in the code the reviewer needs to double check? `npm run eslint` should return 0 errors. ## Why was this MR needed? see Issue #24756 ## Does this MR meet the acceptance criteria? - Tests - [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? Closes #24756 See merge request !7642
2016-11-23Fix sidekiq stats in admin areablackst0ne
Added tests Added changelog entry Resolved all issues in code
2016-11-23Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet
Fix deselecting calendar days on contribution graph ## What does this MR do? Fix deselecting calendar days on contribution graph ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? In `master`, you can currently deselect a calendar day after selecting but you cannot reselect that day. ## Screenshots (if relevant) Before: ![2016-10-25_10.42.20](/uploads/7d442c09cd15082cf69f673a544b56f9/2016-10-25_10.42.20.gif) After: ![2016-10-25_10.40.35](/uploads/6123365f0ec63ee84658ee6057e7715c/2016-10-25_10.40.35.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 you do - 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? Closes #22381 See merge request !6453
2016-11-22Merge branch 'emoji-btn-disabled' into 'master' Fatih Acet
Disabled award emoji button when user is not logged in ## What does this MR do? The award emoji buttons are now disabled when the user is not signed in, stopping them from clicking it & then getting an error. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_10.25.20](/uploads/210378bde90e689fbc12940ce271c05e/Screen_Shot_2016-11-22_at_10.25.20.png) ## What are the relevant issue numbers? Closes #24680 See merge request !7651
2016-11-22Merge branch 'fix/build-without-trace-exceptions' into 'master' Kamil Trzciński
Fix exceptions when loading build trace ## What does this MR do? This MR fixes exceptions when loading build trace. - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24638 See merge request !7658
2016-11-22clean up globals exemptions within .eslintrcMike Greiling
2016-11-22Merge branch 'fix/cycle-analytics-duration' into 'master' James Lopez
fixed bug to do with calculating durations Fixes a couple of small bugs while calculating durations in cycle analytics - probably due to some bad refactoring - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24796 See merge request !7663
2016-11-22Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński
Issue creation now accepts trailing whitespace See merge request !7633
2016-11-22Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern
Add shortcuts for adding users to a project team with a specific role Closes #20944 See merge request !7565
2016-11-22Remove empty describe block in service specSemyon Pupkov
2016-11-22Merge branch '24576_cant_stop_impersonating' into 'master' Sean McGivern
Allow admins to stop impersonating users without e-mail addresses Closes #24576 See merge request !7550
2016-11-22Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable
Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
2016-11-22fix rubocop warningJames Lopez
2016-11-22fixed bug to do with calculating durationsJames Lopez
2016-11-22Improve name of build log state data attributeGrzegorz Bizon
2016-11-22Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet
Add help section for MM commands ## What should this MR do Check @pedroms' design for the Mattermost service screen: https://gitlab.com/gitlab-org/gitlab-ce/issues/22540 Now this has to be implemented, I've created a clean canvas for you, @lbennett, to draw on. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7558
2016-11-22Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński
External jobs do not have show page nor traces Fixes #24677 See merge request !7617
2016-11-22Improve reproducibility of build trace test exampleGrzegorz Bizon
2016-11-22Add missing feature tests for loading build traceGrzegorz Bizon
See #24638
2016-11-22Add missing specs for loading build HTML traceGrzegorz Bizon
2016-11-22Refactor feature tests for project builds pageGrzegorz Bizon
2016-11-22Disabled award emoji button when user is not logged inPhil Hughes
Closes #24680
2016-11-22Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński
Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 10:57:36 +0300