summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Fix test failuresKamil Trzcinski2016-08-121-1/+1
|
* Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-121-2/+28
|\
| * render only commit titleubudzisz2016-08-111-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update CHANGELOG add auto-completion into pipeline add auto-completion into pipeline add auto-completion into pipeline update changelog modify tests remove empty lines add auto-completion into pipeline update changelog modify tests switch text_field_tag into text_field add test to new field switch context into describe Update CHANGELOG render only commit title update CHANGELOG add auto-completion into pipeline add auto-completion into pipeline add auto-completion into pipeline update changelog modify tests remove empty lines add auto-completion into pipeline update changelog modify tests update changelog Update CHANGELOG add indetation add tests to pipeline ref change file name for tests change file name for spec tests remove empty line rename test it rename test name removing unexpected changes removing unexpected changes2 update changelog
* | Fix test failures, that did occur because of missing previously used ↵Kamil Trzcinski2016-08-111-4/+7
| | | | | | | | `reload_status!` call
* | Use state machine for pipeline event processingKamil Trzcinski2016-08-111-4/+0
|/
* Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-112-10/+26
| | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
* Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-091-0/+29
|\
| * Update tree view to sort folders with submodulesAdam Buckland2016-08-091-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Currently trees are sorted in the fashion: - folders - files - submodules with each section sorted alphabetically This changes to this system: - folders and submodules (sorted together) - files
* | fixes part1 of files to start using active tensetiagonbotelho2016-08-0940-182/+182
|/
* Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+45
|\ | | | | | | See merge request !5712.
| * Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+45
| |
* | Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher2016-08-081-1/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Enable some Rubocop cops related to new lines ## What does this MR do? This MR enabled two additional Rubocop cops: Keeps track of empty lines around block bodies. `Style/EmptyLinesAroundBlockBody` Keeps track of empty lines around method bodies. ` Style/EmptyLinesAroundMethodBody` See merge request !5637
| * Enable some Rubocop cops related to new linesGrzegorz Bizon2016-08-031-1/+0
| |
* | Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
| |
* | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-3/+3
| |
* | Update layout and JS for create protected branch.Alfredo Sumaran2016-08-051-4/+4
| | | | | | | | Also updates protect branch list
* | Merge branch 'ref-switcher-enter-submit' into 'master' Jacob Schatz2016-08-051-0/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed enter submitting form in dropdown ## What does this MR do? When searching for a branch in the ref switcher & then pressing enter it would submit the form without anything. This instead doesn't submit the form without anything being selected in the dropdown. Also improved the UX by making it submit with `Turoblinks` as currently no loading bar is shown so the user has no idea if anything is happening. ## What are the relevant issue numbers? Closes #19549 See merge request !5111
| * \ Merge branch 'master' into ref-switcher-enter-submitPhil Hughes2016-08-0320-58/+764
| |\ \ | | |/
| * | Added ref switcher enter key testsPhil Hughes2016-07-191-0/+29
| | |
* | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-031-1/+1
| |/ |/|
* | Fix search results for notes without commitsFelipe Artur2016-08-011-0/+20
| |
* | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-013-35/+190
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensible state specific default sort order for issues and merge requests ## What does this MR do? It provides more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created | ## Are there points in the code the reviewer needs to double check? All the bits where `id_desc` was changed to `created_desc`. I hope it's okay, It makes more sense in my opinion. ## Why was this MR needed? Prior to this MR the issues and merge request were sorted based on `id_desc` by default. This MR aims to make the interface more user-friendly by providing state specific sorting defaults most users would expect. ## What are the relevant issue numbers? See #15064 See merge request !5453
| * | State specific default sort order for issuableszs2016-08-013-35/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
* | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an URL field to Enviroments ## What does this MR do? Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. ## Are there points in the code the reviewer needs to double check? The field is a string on the database, thus limited to 255 chars, which seems more than enough. ## What are the relevant issue numbers? Closes #19527 ## Screenshots (if relevant) ![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support 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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5469
| * | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-291-2/+2
| |/ / | | | | | | | | | | | | This MR adds a string (thus max 255 chars) field to the enviroments table to expose it later in other features.
* | | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-291-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix repo hooks missing on import Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19556 Repo hooks are missing from imported projects - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5549
| * | | fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-281-1/+2
| | | | | | | | | | | | | | | | fix spec and added changelog
* | | | Check for Ci::Build artifacts at database levelPaco Guzman2016-07-291-0/+10
| |/ / |/| |
* | | Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-291-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. It makes sense to reuse these constants since we had them duplicated in the previous enum implementation. This also simplifies our `check_access` implementation, because we can use `project.team.max_member_access` directly. 2. Use `accepts_nested_attributes_for` to create push/merge access levels. This was a bit fiddly to set up, but this simplifies our code by quite a large amount. We can even get rid of `ProtectedBranches::BaseService`. 3. Move API handling back into the API (previously in `ProtectedBranches::BaseService#translate_api_params`. 4. The protected branch services now return a `ProtectedBranch` rather than `true/false`. 5. Run `load_protected_branches` on-demand in the `create` action, to prevent it being called unneccessarily. 6. "Masters" is pre-selected as the default option for "Allowed to Push" and "Allowed to Merge". 7. These changes were based on a review from @rymai in !5081.
* | | Implement review comments from @axil.Timothy Andrew2016-07-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | 1. Align "Allowed to Merge" and "Allowed to Push" dropdowns. 2. Don't display a flash every time a protected branch is updated. Previously, we were using this so the test has something to hook onto before the assertion. Now we're using `wait_for_ajax` instead.
* | | Make specs compatible with PhantomJS versions < 2.Timothy Andrew2016-07-291-4/+0
| | | | | | | | | | | | | | | 1. These versions of PhantomJS don't support `PATCH` requests, so we use a `POST` with `_method` set to `PATCH`.
* | | Humanize protected branches' access levels at one location.Timothy Andrew2016-07-291-9/+2
| | | | | | | | | | | | | | | | | | | | | 1. The model now contains this humanization data, which is the once source of truth. 2. Previously, this was being listed out in the dropdown component as well.
* | | Update protected branches spec to work with the `select`s.Timothy Andrew2016-07-291-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Get the existing spec passing. 2. Add specs for all the access control options, both while creating and updating protected branches. 3. Show a flash notice when updating protected branches, primarily so the spec knows when the update is done.
* | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-281-0/+41
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (45 commits) Replace reject_blocked with reject_blocked! in callbacks. Fix Project#to_param to keep invalid project suitable for use in URLs Update CHANGELOG Add feature specs for edit project settings Fix renaming repository when name contains invalid chars under settings Change requests_profiles resource constraint to catch virtually any file Allow skipping users in autocomplete Fix typo in CHANGELOG Update CHANGELOG Respective cache is now expired when creating a new branch Update CHANGELOG Unify HTML format in static error pages Make error pages responsive design Move color-logic into HipchatService#HipchatService Depened on exact version of SimpleCov when patched Refactor spam validation to a concern that can be easily reused and improve legibility in `SpamCheckService` Refactor `SpamCheckService` to make it cleaner and clearer. Submit all issues on public projects to Akismet if enabled. Submit new issues created via the WebUI by non project members to Akismet for spam check. Upgrade Bullet from 5.0.0 to 5.2.0. ...
| * | Fix Project#to_param to keep invalid project suitable for use in URLsDouglas Barbosa Alexandre2016-07-271-2/+2
| | |
| * | Add feature specs for edit project settingsDouglas Barbosa Alexandre2016-07-271-0/+41
| | |
* | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-272-36/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (38 commits) Remove useless new route Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guide Fix typo in Elixir CI template Add a spec for access_for_user_ids Fix typo in comment Rubocop offenses Optimize the invited group link access level check Incorporate review comments Optimize maximum user access level lookup in loading of notes Fix missing schema update for 20160722221922 Whitelist 'Simplified BSD' license Fix a bug where forking a project from a repository storage to another would fail Remove inline scripts from import pages. Make branches sortable without push permission (!5462) Profile requests when a header is passed Upgrade database_cleaner from 1.4.1 to 1.5.3. Show release notes in tag list Fix expand all diffs button in compare view Add route for Import::GithubController#new Update CHANGELOG ...
| * | Merge branch 'remove-branches-feature-spec-head-file' into 'master' Rémy Coutable2016-07-261-32/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove spec/features/projects/branches_spec.rb~HEAD file ## What does this MR do? Remove unnecessary `spec/features/projects/branches_spec.rb~HEAD` file. See merge request !5489
| | * | Remove spec/features/projects/branches_spec.rb HEAD fileremove-branches-feature-spec-head-fileDouglas Barbosa Alexandre2016-07-261-32/+0
| | | |
| * | | Ensure current user can retry a build before showing the 'Retry' buttonRémy Coutable2016-07-261-4/+26
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Test both for having existing issues or notLin Jen-Shin2016-07-271-2/+12
| | |
* | | Update the description a bitLin Jen-Shin2016-07-261-2/+2
| | |
* | | Test if we're showing the modal and has the right emailLin Jen-Shin2016-07-261-0/+19
|/ /
* | Merge branch ↵Douwe Maan2016-07-251-1/+1
|\ \ | | | | | | | | | 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'
| * | remove search_id for label dropdown filterScott Le2016-07-241-1/+1
| | |
* | | Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-252-0/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
| * \ \ Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-229-5/+139
| |\ \ \
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-218-5/+107
| | |\ \ \ | | | |/ /
| | * | | updates local schematiagonbotelho2016-07-201-0/+32
| | | | |
| * | | | implements the basic filter functionalitytiagonbotelho2016-07-191-0/+32
| |/ / /
View Lorry Controller Status