summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-141-2/+64
|
* [Issue Sorting] Improve migrationValery Sizov2017-03-141-1/+0
|
* [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-141-14/+26
|
* Fix relative position calculationValery Sizov2017-03-141-0/+27
|
* Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' Sean McGivern2017-03-141-0/+63
|\ | | | | | | | | | | | | Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836
| * Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-101-0/+63
| |
* | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' Rémy Coutable2017-03-142-0/+6
|\ \ | | | | | | | | | | | | Fix regression in runners registration v1 api See merge request !9904
| * | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-apiTomasz Maczukin2017-03-132-0/+6
| | |
* | | Use a button and a post request instead of UJS links - part 1 - EnvironmentsFilipa Lacerda2017-03-1412-82/+128
| | |
* | | Organize our polyfills and standardize on core-jsMike Greiling2017-03-1315-112/+46
| | |
* | | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-133-30/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779
| * | | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-133-30/+70
| | | | | | | | | | | | | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly.
* | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-131-6/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Display error message when deleting tag in web UI fails See merge request !9906
| * | | | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tagsAdam Niedzielski2017-03-131-6/+21
| | | | |
* | | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵Alfredo Sumaran2017-03-132-14/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update permalink/blame buttons with line number fragment hash Closes #19742 See merge request !9461
| * | | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-linksEric Eastwood2017-03-132-14/+101
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742
* | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-1311-106/+487
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266
| * | | | | | Rename variableBob Van Landuyt2017-03-138-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
| * | | | | | Separate flash messages for resolving one or multiple discussionsBob Van Landuyt2017-03-131-12/+12
| | | | | | |
| * | | | | | Show correct message when user cannot resolve discussionsBob Van Landuyt2017-03-132-77/+109
| | | | | | |
| * | | | | | Make sure the for a merge request only gets executed once.Bob Van Landuyt2017-03-131-0/+19
| | | | | | |
| * | | | | | Add a flash messages when an issue resolving discussions is createdBob Van Landuyt2017-03-132-0/+24
| | | | | | |
| * | | | | | Build link to discussions to resolve in a helperBob Van Landuyt2017-03-131-0/+32
| | | | | | |
| * | | | | | Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `>`-quote style instead of `>>>`. Also: Update documentation images.
| * | | | | | No need to look up the notable separately in the ResolveServiceBob Van Landuyt2017-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request will now always be there when the discussion was resolved by creating a new issue.
| * | | | | | Finding discussions in NotesFinder is no longer required.Bob Van Landuyt2017-03-131-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the MergeRequest is now a required param for resolving discussions
| * | | | | | Move functionality for resolving discussions into a concernBob Van Landuyt2017-03-131-3/+12
| | | | | | |
| * | | | | | Add a button to delegate all discussions in a merge requestBob Van Landuyt2017-03-131-20/+45
| | | | | | |
| * | | | | | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-138-102/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
| * | | | | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-1312-75/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* | | | | | | Merge branch '29242-fix-api-specs-potential-weird-failures-on-retries' into ↵Robert Speicher2017-03-134-6/+24
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Implement `json_response` as a `let` variable Closes #29242 See merge request !9825
| * | | | | | Retry only on feature specs that use JS, on CI29242-fix-api-specs-potential-weird-failures-on-retriesRémy Coutable2017-03-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Implement `json_response` as a `let` variableRémy Coutable2017-03-134-6/+17
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a good idea to memoize `json_response` using an instance variable because `rspec-retry` doesn't clear instance variables on retries, only `let` variables. This will avoid issues where retries would fail on a different line that the original failure, blurrying what's the real failure. Also, automatically add api: true to specs under /spec/requests/(ci/)?api/, and include JsonHelpers in controller, request and API specs. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-136-0/+384
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | New file from interface on existing branch Closes #24501 See merge request !8427
| * | | | | New file from interface on existing branchJacopo2017-03-136-0/+384
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
* | | | | Merge branch 'dz-blacklist--names' into 'master' Douwe Maan2017-03-131-0/+47
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Blacklist nested groups and project names that can cause ambiguous routing for HA Closes #29324 See merge request !9898
| * | | | Reserve few project and nested group pathsDmitriy Zaporozhets2017-03-131-0/+47
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | That have wildcard routes associated and not reserved yet: artifacts, graphs, badges and refs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' Sean McGivern2017-03-131-5/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo' to Todos in the Done tab Closes #27114 See merge request !8782
| * | | | Add 'Undo' to Todos in the Done tabJacopo2017-03-101-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo' the todos marked complete in the 'Done' tab of the Todo dashboard. Added the ability to 'Undo mark all as done' todos marked complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard.
* | | | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406Adam Niedzielski2017-03-131-2/+10
| |/ / / |/| | |
* | | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-135-21/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor/global permissions for internal users See merge request !9598
| * | | | add a spec that the ghost user cannot log inhttp://jneen.net/2017-03-091-0/+12
| | | | |
| * | | | spec the new behavior of .class_forhttp://jneen.net/2017-03-091-4/+6
| | | | | | | | | | | | | | | | | | | | and more robustly spec the ancestor behavior
| * | | | spec the behavior of nil subjectshttp://jneen.net/2017-03-091-0/+6
| | | | |
| * | | | fix a brittle stubhttp://jneen.net/2017-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | true is neither nil nor a user and doesn't make sense as the return value of `current_user`
| * | | | don't require ghost users to be blockedhttp://jneen.net/2017-03-091-16/+0
| | | | |
* | | | | Merge branch '24137-issuable-permalink' into 'master' Rémy Coutable2017-03-132-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link issuable reference to itself in header Closes #24137 See merge request !9641
| * | | | | link issuable reference to itself in headermhasbini2017-03-092-0/+21
| | | | | |
* | | | | | Resolve transient failure in spec/models/user_spec.rbGeorge Andrinopoulos2017-03-131-2/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch '29046-fix-github-importer-open-prs' into 'master' Douwe Maan2017-03-102-33/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub Import deleting branches for open PRs from a fork Closes #29046 See merge request !9758
View Lorry Controller Status