Dmitriy Zaporozhets
4dfded8934
Make left menu more hierarchical and less contextual by adding back item at top
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets
d8dfbc5118
Improve readme tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-09 14:31:03 +02:00
Dmitriy Zaporozhets
846538076b
Dont check for link but for actual readme content
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-09 13:27:50 +02:00
Dmitriy Zaporozhets
e05fbf0494
Fix creating file in new repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 17:41:59 +02:00
Dmitriy Zaporozhets
39a4bb2abd
Cleanup and some test fixes after refactoring project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets
8404ab46b9
Add shortcut for project activity page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 12:43:46 +02:00
Stan Hu
0b4b045758
Merge branch 'improve-spinach-test-for-mr-submit' into 'master'
...
Add an expect call to prevent random Spinach failure
This should help prevent getting the error:
```
Unable to find field "merge_request_title
```
This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up.
See merge request !882
2015-07-01 16:54:32 +00:00
Douwe Maan
690aafebdb
Merge branch 'group_settings_nav' into 'master'
...
Fix consistency issue in sidebars of Project and Group Settings.
Fixes #2277
See merge request !1871
2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets
32330e8c28
Merge branch 'rs-fix-subscription-feature' into 'master'
...
Attempt to fix the "I should see that I am [un]subscribed" steps
Makes use of Capybara methods that wait. Hopefully this will fix the
random timing-related failures of this step.
See merge request !853
2015-06-29 08:57:32 +00:00
Dmitriy Zaporozhets
06ab7d89f9
Merge branch 'rs-issue-1887' into 'master'
...
Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.
Fixes #1887
See merge request !892
2015-06-26 16:17:07 +00:00
Dmitriy Zaporozhets
c9f21c9691
Use page.within in tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-26 16:01:02 +02:00
Robert Speicher
d92bb3cfe0
Attempt to fix the "I should see that I am [un]subscribed" steps
...
Makes use of Capybara methods that wait. Hopefully this will fix the
random timing-related failures of this step.
2015-06-25 21:37:16 -04:00
Robert Speicher
e14d517b61
Fix merge request diff features
2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets
304386aa02
Write test for submitting issue as guest
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-25 16:38:14 +02:00
Nicolas
a521e88fc0
Fix consistency issue in sidebars of Project and Group Settings.
...
Fixes #2277 .
2015-06-24 18:05:16 +02:00
Stan Hu
357cd97199
Add an expect call to prevent random Spinach failure:
...
"Unable to find field "merge_request_title"
2015-06-23 23:19:32 -07:00
Stan Hu
555fd0cf4a
Fix downloading of patches on public merge requests when user logged out
...
Closes #1225
Closes #1854
Closes #1858
2015-06-23 05:34:21 -07:00
Dmitriy Zaporozhets
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
Dmitriy Zaporozhets
4aa1fdd347
Merge branch 'fix-project-icon-links' into 'master'
...
Fix avatar tests to use banana_sample.gif
Fixes tests that were broken in f5e0e5c0!866
2015-06-23 08:32:21 +00:00
Stan Hu
fe94254571
Fix avatar tests to use banana_sample.gif since SVG is not supported
2015-06-22 12:04:07 -07:00
Dmitriy Zaporozhets
cc9b5c49d1
Merge branch 'revert-mr-state-names'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets
f167f37e5a
Fix rubocop issues at feature/ directory
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-22 14:21:34 +02:00
Robert Speicher and Dmitriy Zaporozhets
afec5efc7d
Fix features syntax
2015-06-22 12:13:45 +02:00
Dmitriy Zaporozhets
7524d7c082
Revert merge request states renaming
...
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-19 17:09:50 +02:00
Robert Speicher
1f88d9b56f
Remove "Multiselect Blob" feature specs
...
These are well covered by the new Jasmine tests, and faster!
2015-06-19 04:31:24 -04:00
Stan Hu
a7932fe2fd
Support commenting on a diff in side-by-side view
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
Robert Speicher
4c42fc7c4c
Call page.all instead of all in feature steps
...
There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.
See https://github.com/jnicklas/capybara/issues/1396
2015-06-12 05:12:42 -04:00
Robert Speicher
584f8601ef
Change within to page.within in feature steps
2015-06-12 05:12:42 -04:00
Robert Speicher
69bbc413fe
Update all should-style syntax to expect in features
2015-06-12 05:12:09 -04:00
Dmitriy Zaporozhets
11bf5b693b
Fix test for accept merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-12 09:29:27 +02:00
Dmitriy Zaporozhets
a35aec7adb
Fix merge request test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-11 22:27:26 +02:00
Robert Speicher
700d4387ce
Use stub_const to stub constants instead of redefining them
...
They're called constants for a reason, after all.
2015-06-10 01:31:27 -04:00
Stan Hu
5e4384ec9b
Support editing target branch of merge request
...
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
Robert Speicher
5c52eaa9d2
Persist current merge request tab selection via URL
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
2015-05-27 22:39:11 -04:00
Stan Hu
ab88b7da19
Fix project snippets button appearing when it is disabled
...
Closes #1705
2015-05-27 05:07:44 -07:00
Dmitriy Zaporozhets
9eec0d5436
Merge branch 'accepted-rejected-mrs' into 'master'
...
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.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201 .
See merge request !702
2015-05-27 11:40:36 +00:00
Jeroen van Baarsen
aa36a19613
Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation
...
Validate wiki page creation
2015-05-26 20:05:25 +02:00
Jeroen van Baarsen
b16aad9dd1
Validate wiki page creation
...
**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 >
2015-05-26 19:01:11 +02:00
Dmitriy Zaporozhets
b23025b669
Merge branch 'rs-gems' into 'master'
...
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
2015-05-26 14:42:15 +00:00
Douwe Maan
7df45882a9
Update specs.
2015-05-25 18:37:38 +02:00
Stan Hu
a7d8a7bd3d
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings
...
Closes #1676
2015-05-25 06:16:33 -04:00
Stan Hu
7a7ce70169
Use the user list from the target project in a merge request
...
Closes #1535
2015-05-22 09:52:09 -04:00
Robert Speicher
9789b56a31
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`.
2015-05-20 19:22:00 -04:00
Dmitriy Zaporozhets
e1a8089cc2
Merge branch 'create-merge-request' into 'master'
...
Add Create Merge Request buttons to commits page and push event.
Commits page:
Branches page:
Push event: (Only for new branches, and only shown to the pushing user)
Push event with multiple commits and a Compare link:
See merge request !632
2015-05-11 19:43:56 +00:00
Douwe Maan
e80c4447a8
Fix spec.
2015-05-09 23:50:51 +02:00
Maran
a0fd2eb568
Don't show duplicate deploy keys. Fixes #1516
2015-05-08 21:32:03 +02:00
Robert Speicher
f3d63eeb18
Remove feature tests for old task lists
2015-05-06 13:00:14 -04:00
Dmitriy Zaporozhets
c66e575179
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-06 17:00:19 +03:00
Dmitriy Zaporozhets
16db90e5fc
Fix project test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-05 21:43:33 +03:00
Dmitriy Zaporozhets
16db51ec58
Merge branch 'fix-wiki-search' into 'master'
...
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
2015-05-04 08:53:21 +00:00
Dmitriy Zaporozhets
Stan Hu
Douwe Maan
Robert Speicher
Nicolas
Jeroen van Baarsen
Maran
