summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
...
* | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-132-34/+0
| |
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-133-7/+7
|/
* Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
* Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
|
* Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
|
* Fix test for accept merge requestDmitriy Zaporozhets2015-06-121-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix merge request testrefactor-mr-widgetDmitriy Zaporozhets2015-06-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use stub_const to stub constants instead of redefining themRobert Speicher2015-06-101-2/+1
| | | | They're called constants for a reason, after all.
* Move Project Members link from Settings to main menu.Nicolas2015-06-093-7/+13
| | | | Addresses #2278.
* Properly click on user profile pictureimprove-navigationDmitriy Zaporozhets2015-06-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2015-06-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets2015-06-041-1/+0
|\ | | | | | | | | | | | | | | | | | | Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
| * Remove unnecessary require from Spinach envRobert Speicher2015-06-041-1/+0
| |
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-032-16/+0
|/
* Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets2015-05-293-2/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
| * Support editing target branch of merge requestStan Hu2015-05-293-2/+24
| | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
* | Fix tests for group leave featureDmitriy Zaporozhets2015-05-292-1/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-291-11/+13
|\ \ | | | | | | Allow special characters in users bio
| * | Allow special characters in users bioJeroen van Baarsen2015-05-281-11/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It removes the very strict sanitation on the users bio field, so that people can have a bio like "I <3 GitLab" **Why is this needed?** Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is unexpected behaviour, since we want users to have a normal profile, without having to worry what characters are allowed and which are not. **Related issues:** Fixes https://github.com/gitlabhq/gitlabhq/issues/5625 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Fix profile tests after header renameDmitriy Zaporozhets2015-05-282-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-271-1/+4
| | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-271-2/+2
|\ | | | | | | | | | | | | | | Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
| * Fix spec.browse-milestone-issuesDouwe Maan2015-05-271-2/+2
| |
* | Fix project snippets button appearing when it is disabledStan Hu2015-05-273-0/+14
|/ | | | Closes #1705
* Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-272-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Accepted and Rejected tabs to MR lists. Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites. ![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png) ![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png) ![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png) Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702
| * Update specs.accepted-rejected-mrsDouwe Maan2015-05-252-6/+6
| |
* | Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creationJeroen van Baarsen2015-05-262-0/+15
|\ \ | | | | | | Validate wiki page creation
| * | Validate wiki page creationJeroen van Baarsen2015-05-262-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It adds validation to the creation of a wiki page, that way the user gets real feedback instead of just a 404 page if the name of the wiki page was invalid **Why is this needed?** There are a lot of characters that are not allowed in the creation of a wiki page, there is even a small text that is saying: Please don't use spaces. Although we have that text there, we don't actually validate on this. This commit adds validation on the title and gives the user actual feedback. **What issues does this fix?** Fixes http://github.com/gitlabhq/gitlabhq/issues/5357 Fixes https://github.com/gitlabhq/gitlabhq/issues/8565 Fixes https://github.com/gitlabhq/gitlabhq/issues/3913 Fixes https://github.com/gitlabhq/gitlabhq/issues/8166 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-261-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
| * | Update ffaker gemRobert Speicher2015-05-201-1/+1
| | | | | | | | | | | | | | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
* | | Disable "New Issue" and "New Merge Request" buttons when features are ↵Stan Hu2015-05-253-0/+20
| |/ |/| | | | | | | | | disabled in project settings Closes #1676
* | Use the user list from the target project in a merge requestStan Hu2015-05-222-0/+27
|/ | | | Closes #1535
* Merge branch 'create-merge-request' into 'master'Dmitriy Zaporozhets2015-05-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Create Merge Request buttons to commits page and push event. Commits page: ![Screen_Shot_2015-05-09_at_22.27.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f77c2e47f768b2fc132de6e3a2a0323e/Screen_Shot_2015-05-09_at_22.27.09.png) Branches page: ![Screen_Shot_2015-05-09_at_22.55.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0a6374f5c5d830ef19de9694e603c8f/Screen_Shot_2015-05-09_at_22.55.24.png) Push event: (Only for new branches, and only shown to the pushing user) ![Screen_Shot_2015-05-09_at_22.27.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/989c9cb66ee03d09b96809452749d2b8/Screen_Shot_2015-05-09_at_22.27.21.png) Push event with multiple commits and a Compare link: ![Screen_Shot_2015-05-09_at_22.28.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a70c718e559f69177f9341c0af92707c/Screen_Shot_2015-05-09_at_22.28.01.png) See merge request !632
| * Fix spec.Douwe Maan2015-05-091-1/+1
| |
* | Don't show duplicate deploy keys. Fixes #1516Maran2015-05-082-5/+16
|/
* Remove feature tests for old task listsRobert Speicher2015-05-067-160/+4
|
* Fix testsrefactor-mr-formDmitriy Zaporozhets2015-05-062-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix project testrefactor-project-pageDmitriy Zaporozhets2015-05-051-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-043-0/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when searching Wiki pages If a Wiki page turns up a hit in the search results, an error will occur: ``` Completed 500 Internal Server Error in 836ms NoMethodError - undefined method `slug' for "test.markdown":String: app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path' app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700' actionview (4.1.9) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.9) lib/action_view/template.rb:339:in `instrument' actionview (4.1.9) lib/action_view/template.rb:143:in `render' ``` An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case. Closes #1547 See merge request !592
| * Fix Error 500 when searching Wiki pagesStan Hu2015-04-303-0/+31
| | | | | | | | Closes #1547
* | Fix header_should_have_correct_id_and_link for featuresRobert Speicher2015-04-301-2/+6
| |
* | Merge branch 'fix-project-tags' into 'master'Douwe Maan2015-04-302-0/+15
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DB error when trying to tag a repository Steps to reproduce: Go to a project settings, add tags, click on save changes Observed behavior: Error 500 ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. * Closes #1512 * Closes #1550 * Closes https://github.com/gitlabhq/gitlabhq/issues/6867 * Closes https://github.com/gitlabhq/gitlabhq/issues/9194 See merge request !577
| * Fix DB error when trying to tag a repositoryStan Hu2015-04-272-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon tagging a repository, an error due to a missing migration occurred: ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. Closes #1512 Closes https://github.com/gitlabhq/gitlabhq/issues/6867 Closes https://github.com/gitlabhq/gitlabhq/issues/9194
* | Fix testsDmitriy Zaporozhets2015-04-291-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-capybara-screenshot' into 'master'Dmitriy Zaporozhets2015-04-273-26/+39
|\ | | | | | | | | | | | | | | | | | | Add capybara-screenshot gem This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code. Also reduces the timeout for Capybara tests when not in a CI environment. See merge request !578
| * Don't use capybara-screenshot in CI environmentsrs-capybara-screenshotRobert Speicher2015-04-251-3/+5
| |
| * Enable js_errors for Capybara in Spinach and RSpecRobert Speicher2015-04-251-1/+1
| |
| * Reduce timeout for non-CI featuresRobert Speicher2015-04-251-2/+5
| |
| * Move Spinach setup for db_cleaner and capybara to their own filesRobert Speicher2015-04-253-26/+34
| | | | | | | | | | Also adds capybara-screenshot, which will automatically save the page as html and an image whenever a feature fails. Handy for debugging.
* | Fix "Dashboard > New project" featureRobert Speicher2015-04-251-1/+3
|/
View Lorry Controller Status