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
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
Douwe Maan
2f4426b7e4
Merge branch 'fix-project-tags' into 'master'
...
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
2015-04-30 17:20:36 +00:00
Stan Hu
d79348ab55
Fix Error 500 when searching Wiki pages
...
Closes #1547
2015-04-30 08:54:08 -07:00
Dmitriy Zaporozhets
7534d0ef46
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-04-29 19:52:25 +03:00
Stan Hu
44afcd2019
Fix DB error when trying to tag a repository
...
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
2015-04-27 06:09:20 -07:00
Dmitriy Zaporozhets
b0ed2ff1a6
Merge branch 'atom-feeds-everywhere' into 'master'
...
Add project activity atom feed and show atom feed buttons everywhere where applicable.
See merge request !555
2015-04-24 10:15:13 +00:00
Robert Speicher
9b330859bf
Change "Sam" to "Dmitriy" in feature steps
...
"Sam" was too short and generic and caused invalid test failures due to
finding other people with names like "Sammie" or "Samuel" unexpectedly.
2015-04-23 18:59:57 -04:00
Douwe Maan
a8812dc148
Fix spec.
2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets
e3d818a4e8
Merge branch 'invitation' into 'master'
...
Allow users to be invited.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058 .
The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.
Entering an email address that is not already a member will give you the option to invite them.
Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.
The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.
The invited user will receive an email with an "Accept invitation" link.
If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.
Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.
Accepting the invitation will redirect them to the group (or project) with an appropriate notice.
As currently, they will also receive this information by email.
At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.
The member row on the Members page will now have been updated with the new user account.
See merge request !500
2015-04-15 10:48:28 +00:00
Stan Hu
48efd65ff6
Remove timing dependency on test
...
See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara
2015-04-14 10:34:48 -07:00
Douwe Maan
8949af0c9f
Add feature tests for inviting members.
2015-04-14 12:08:11 +02:00
Dmitriy Zaporozhets
9c14ed0689
Merge branch 'public-deploy-keys' into 'master'
...
Allow admin to create public deploy keys that are accessible to any project.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774 .
Project settings:
The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
The list of projects below the public key has been changed to only show projects the user has access to.
"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
Admin index:
Admin detail page:
Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
2015-04-13 09:08:13 +00:00
Stan Hu
3d2c387840
Move current user to the top of the list in author/assignee filters
...
Closes #1321
2015-04-09 01:04:53 -07:00
Stan Hu
3143edfea6
Fix bug where Wiki pages that include a '/' were no longer accessible
...
Closes #1363
2015-04-07 09:10:11 -07:00
Douwe Maan
9b3624071e
Add project deploy keys tests.
2015-04-03 12:40:14 +02:00
Douwe Maan
317206300d
Merge branch 'configurable-attachment-size' into 'master'
...
Support configurable attachment size in Application Settings page
### What does this MR do?
This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.
### Are there points in the code the reviewer needs to double check?
What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.
### Why was this MR needed?
We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/ )?
See Issue #1258
### Screenshots
Before:
After:
See merge request !407
2015-04-03 08:47:55 +00:00
Dmitriy Zaporozhets
Stan Hu
Robert SpeicherandDmitriy Zaporozhets
Jeroen van Baarsen
Douwe Maan
Maran
