summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Disable warming of the asset cache in Spinach tests under CIStan Hu2016-10-211-1/+1
| | | | | | | | | | | | I suspect some combination of Knapsack tests cause no regular Rack tests to be loaded (i.e. all JavaScript tests), which leads to the error: ArgumentError: rack-test requires a rack application, but none was given In CI, we precompile all the assets so there is no need to warm the asset cache in any case. Closes #23613
* Differentiate the expire from leave eventCallum Dryden2016-10-202-40/+0
| | | | | | | | | | At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.
* Fix project issues labels feature specDouglas Barbosa Alexandre2016-10-191-1/+1
|
* Wait for ajax for every merge request spinach testdz-spinach-wait-ajaxDmitriy Zaporozhets2016-10-184-14/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'dz-fix-spinach-mr' into 'master' Dmitriy Zaporozhets2016-10-171-0/+1
|\ | | | | | | | | | | | | Fix randomly crashing spinach test for merge request For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6932
| * Fix randomly crashing spinach test for merge requestDmitriy Zaporozhets2016-10-171-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | [Great spinach fix] Replace gsub with deleteValery Sizov2016-10-171-1/+1
| |
* | Remove carriage returns from commit description as summary is on a newline ↵Luke Bennett2016-10-171-1/+1
|/ | | | and will always include carriage returns
* Merge branch 'fix-trending-projects-spinach-failure' into 'master' Dmitriy Zaporozhets2016-10-172-0/+5
|\ | | | | | | | | | | | | | | | | Fix trending projects Spinach failure The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list. Partial fix to #23378 See merge request !6911
| * Fix trending projects Spinach failurefix-trending-projects-spinach-failureStan Hu2016-10-142-0/+5
| | | | | | | | | | | | | | The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list. Partial fix to #23378
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-5/+9
| |
* | Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-161-6/+14
| | | | | | | | Partial fix to #23378
* | Merge branch 'dz-fix-branches-tab-test' into 'master' Dmitriy Zaporozhets2016-10-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix active tab test for branches page For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6923
| * | Fix active tab test for branches pagedz-fix-branches-tab-testDmitriy Zaporozhets2016-10-161-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix merge requests feature testsfix-merge-request-diff-spinach-failuresDmitriy Zaporozhets2016-10-161-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Wait for ajax call in merge request unsubscribe testDmitriy Zaporozhets2016-10-161-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix Spinach merge request diff failuresStan Hu2016-10-151-3/+4
|/ / | | | | | | | | | | | | | | gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests. Partial fix to #23378
* | Fix Spinach failure due overprecise percentage matchingfix-language-spinach-failureStan Hu2016-10-141-2/+2
|/ | | | | | | The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378
* Merge branch 'cs-really-fix-spinach'Kamil Trzcinski2016-10-142-1/+3
|\
| * Try to fix re-runcs-really-fix-spinachKamil Trzcinski2016-10-141-0/+2
| |
| * Remove spinach retry.Connor Shea2016-10-141-1/+1
| |
* | Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets2016-10-142-17/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing routes to make group edits work 6b90ccb9fd changed the routes so that users/groups can be accessed via`/:id`, but the Rails `form_for` method expects to use the `groups#show` path helper for the form action URL. This causes group edits and deletes to fail because the PUT/PATCH/DELETE methods did not exist for `/:id`. This MR adds these methods so that `form_for` continues to work. Closes #23306 See merge request !6874
| * | Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets2016-10-142-17/+0
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-144-18/+17
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
| * Merge branch 'master' into members-uiPhil Hughes2016-10-066-14/+26
| |\
| * \ Merge branch 'master' into members-uiPhil Hughes2016-10-048-71/+8
| |\ \
| * | | Fixed group testsPhil Hughes2016-09-132-2/+2
| | | |
| * | | Updated some specsPhil Hughes2016-09-131-4/+4
| | | | | | | | | | | | | | | | Fixed issue with group name not showing
| * | | Added import button back inPhil Hughes2016-09-131-1/+1
| | | |
| * | | Tests updatePhil Hughes2016-09-133-11/+10
| | | |
* | | | Add tag shortcut from the Commit pageAkram FARES2016-10-062-0/+13
| |_|/ |/| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-062-6/+15
| | |
* | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-0/+1
|\ \ \ | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
* | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-043-66/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
| | * | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-0/+1
| | | | |
| * | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-featuresRobert Speicher2016-10-032-66/+0
| |/ / /
* | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-036-6/+11
|\ \ \ \ | |/ / /
| * | | Add organization field to user profileDmitriy Zaporozhets2016-09-271-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'full-width-new-snippet-button' into 'master' Fatih Acet2016-09-262-3/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added full-width new snippet button on mobile and corrected capitalization ## What does this MR do? Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? @connorshea Spotted that I missed this in !6210 :) ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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? See merge request !6380
| | * | Added full-width new snippet button on mobile and corrected capitalizationfull-width-new-snippet-buttonLuke Bennett2016-09-182-3/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | Altered specs that click capitalised New Snippet button Applied review feedback missed in Changes `.no-comment` `opactiy: 0.5` to `opacity: .5` Added `.btn-wide-on-xs` and applied to snippet buttons
| * | fix issues mr counterbarthc2016-09-202-2/+2
| |/
| * Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-081-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Slack integration for pipeline hooks ## What does this MR do? Add pipeline events to Slack integration ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug See merge request !5525
| | * Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-064-29/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (368 commits) Don't fail on an empty database Refactor authorization_for_merge_requests.md Support MySQL too, when removing gitorious from import_sources Remove gitorious from import_sources on ApplicationSetting model Add links to new docs in merge_requests.md and workflow/README.md Move merge request versions to its own document Move "Only allow merge requests to be merged if the build succeeds" to new location Move revert_changes.md to new location Move cherry_pick_changes.md to new location Move `wip_merge_requests.md` to a new location Move merge_when_build_succeeds.md to new location Fix missing flash messages on service edit page Move authorization_for_merge_requests.md to new location Move `workflow/merge_requests.md` to `user/project/merge_requests.md` Update README.md Fix randomly failing specs in expand_collapse_diff_spec: Add link on API docs index page Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 Remove suggested colors hover underline Fix markdown anchor icon interaction ...
| | * \ Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-264-6/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
| | * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-2424-54/+84
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1174 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
| | * \ \ \ Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-022-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (145 commits) Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586) Add failing tests for #19028 Update installation guide for 8.11 Update CHANGELOG for 8.10.3 Catch what warden might throw when profiling requests to re-throw it webhooks: include old revision in MR update events Fix search results for notes without commits API methods should be documented using Grape's DSL Update CHANGELOG Fix RequestProfiler::Middleware error when code is reloaded in development Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration Fix specs Trim extra displayed carriage returns in diffs and files with CRLFs Avoid line_code and position calculation on line partial for plain view State specific default sort order for issuables refactored wait_for_archived_file method squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit fix return value and spec squashed - fix timing issues in prod importing projects Minor fixes in the Env API endpoints ...
| | * | | | | Fix test for checking everything for Slack serviceLin Jen-Shin2016-07-301-0/+1
| | | | | | |
| * | | | | | Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets2016-09-081-1/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status