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
8c6cbd4306
Merge branch 'master' into admin-edit-identities
2015-06-23 12:09:45 +02:00
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
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
fe94254571
Fix avatar tests to use banana_sample.gif since SVG is not supported
2015-06-22 12:04:07 -07:00
73e003013f
Merge branch 'master' into admin-edit-identities
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/admin/users/show.html.haml
2015-06-22 18:00:11 +02:00
3fe3cbf222
Fix indendity test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 17:52:22 +02:00
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
f167f37e5a
Fix rubocop issues at feature/ directory
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 14:21:34 +02:00
afec5efc7d
Fix features syntax
2015-06-22 12:13:45 +02:00
f3d99a1e9c
Started on the actual rspec 3 upgrade
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-22 12:12:49 +02:00
b2eef41d41
Merge branch 'fix-error-500-internal-snippet' into 'master'
...
Fix Error 500 when one user attempts to access another's personal, internal snippet
### What does this MR do?
This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce:
### Why was this MR needed?
1. Go to `<hostname>/snippets/new`.
2. Select "Internal".
3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`)
4. Logout and sign in as another user.
5. Go to the URL in step 3.
### What are the relevant issue numbers?
Closes #1815
See merge request !854
2015-06-20 10:38:33 +00:00
e785b9d2e2
Fix Error 500 when one user attempts to access a personal, internal snippet
...
Closes #1815
2015-06-19 21:23:46 -07:00
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
aca6d36722
Add tests for admin managing user identities
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
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
adffe47d3c
Merge branch 'support-comment-parallel-diff' into 'master'
...
Support commenting on a diff in side-by-side view
### What does this MR do?
This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779 ) when the comment button is clicked on a line that already has a comment.
There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.
### Why was this MR needed?
Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
### Screenshot
See merge request !810
2015-06-16 14:43:15 +00:00
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
63969337a9
Merge branch 'applications_form' into 'master'
...
Fix UI issues in Applications form
@douwe Thanks for reviewing this small fix.
---
Before:
---
After:
See merge request !1859
2015-06-16 11:50:13 +00:00
4cf7d8d956
Fix consistency issues on New Application page.
2015-06-15 21:27:20 +02:00
0c0c31ff34
Move the "Design" templates and logic to Preferences
2015-06-13 17:58:16 -04:00
821fc4b034
Add Profiles::PreferencesController
2015-06-13 17:58:15 -04:00
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
584f8601ef
Change `within` to `page.within` in feature steps
2015-06-12 05:12:42 -04:00
69bbc413fe
Update all `should`-style syntax to `expect` in features
2015-06-12 05:12:09 -04:00
11bf5b693b
Fix test for accept merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-12 09:29:27 +02:00
a35aec7adb
Fix merge request test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 22:27:26 +02:00
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
ebe4963871
Move Project Members link from Settings to main menu.
...
Addresses #2278 .
2015-06-09 14:45:38 +02:00
5b4ab5a0ca
Properly click on user profile picture
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-08 18:20:00 +02:00
8ee57adc8a
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-08 17:29:27 +02:00
bedc66eb04
Merge branch 'rs-remove-guard' into 'master'
...
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
2015-06-04 17:54:33 +00:00
44396e44a3
Remove unnecessary require from Spinach env
2015-06-04 11:47:00 -04:00
6e5473f930
Remove show actions from Admin and Project DeployKeys
2015-06-03 18:03:04 -04:00
a1c45338f3
Merge branch 'support-edit-target-branch-in-mr' into 'master'
...
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**
**New MR page**
**System note**
### 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
2015-05-29 15:01:54 +00:00
85de253ee1
Fix tests for group leave feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 15:07:04 +02:00
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
d047d299bf
Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio
...
Allow special characters in users bio
2015-05-29 10:41:01 +02:00
9e50f28ee9
Fix profile tests after header rename
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 15:32:28 +02:00
3865a1d925
Allow special characters in users bio
...
**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>
2015-05-28 10:45:22 +02:00
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
b222f211c1
Merge branch 'browse-milestone-issues' into 'master'
...
Fix milestone "Browse Issues" button.
After refactoring around issue/merge requests filters, the button stopped working :(
See merge request !699
2015-05-27 15:31:52 +00:00
e6f282e0f1
Fix spec.
2015-05-27 14:23:04 +02:00
ab88b7da19
Fix project snippets button appearing when it is disabled
...
Closes #1705
2015-05-27 05:07:44 -07:00
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
aa36a19613
Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation
...
Validate wiki page creation
2015-05-26 20:05:25 +02:00
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
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
7df45882a9
Update specs.
2015-05-25 18:37:38 +02:00
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
7a7ce70169
Use the user list from the target project in a merge request
...
Closes #1535
2015-05-22 09:52:09 -04:00
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
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
e80c4447a8
Fix spec.
2015-05-09 23:50:51 +02:00
a0fd2eb568
Don't show duplicate deploy keys. Fixes #1516
2015-05-08 21:32:03 +02:00
f3d63eeb18
Remove feature tests for old task lists
2015-05-06 13:00:14 -04:00
c66e575179
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06 17:00:19 +03:00
16db90e5fc
Fix project test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 21:43:33 +03:00
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
a3fbf34469
Fix header_should_have_correct_id_and_link for features
2015-04-30 16:35:26 -04:00
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
d79348ab55
Fix Error 500 when searching Wiki pages
...
Closes #1547
2015-04-30 08:54:08 -07:00
7534d0ef46
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-29 19:52:25 +03:00
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
f3ffd7d0b1
Merge branch 'rs-capybara-screenshot' into 'master'
...
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
2015-04-27 07:43:45 +00:00
652c15b585
Don't use capybara-screenshot in CI environments
2015-04-25 21:33:17 -04:00
3875930793
Enable js_errors for Capybara in Spinach and RSpec
2015-04-25 21:33:16 -04:00
1e3fc84cd1
Reduce timeout for non-CI features
2015-04-25 21:33:16 -04:00
55831a4d50
Move Spinach setup for db_cleaner and capybara to their own files
...
Also adds capybara-screenshot, which will automatically save the page as
html and an image whenever a feature fails. Handy for debugging.
2015-04-25 21:33:16 -04:00
a11b07f31d
Fix "Dashboard > New project" feature
2015-04-25 14:26:04 -04:00
2f04599751
Fix bug where Slack service channel was not saved in admin template settings.
...
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
2015-04-24 08:33:24 -07:00
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
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
a8812dc148
Fix spec.
2015-04-23 17:11:39 +02:00
47d26b05a4
Fix snippets tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-22 18:25:09 +03:00
ef47ea3d39
Revert "Fix and improve help rendering"
...
This reverts commit d365004e68
2015-04-15 12:24:44 -04:00
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
b75866120b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-15 12:56:25 +03:00
5d1ab47bd2
Revert help link tests removal
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-15 12:13:49 +03:00
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
c1531fe1d8
Add spinach tests around accepting and declining invitations.
2015-04-14 18:04:29 +02:00
8949af0c9f
Add feature tests for inviting members.
2015-04-14 12:08:11 +02:00
a62dbd11cb
fix failing test
2015-04-13 23:43:11 +02:00
a9306613f6
The help link has been removed. The commit removes the test for it.
2015-04-13 22:46:18 +02:00
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
3d2c387840
Move current user to the top of the list in author/assignee filters
...
Closes #1321
2015-04-09 01:04:53 -07:00
3143edfea6
Fix bug where Wiki pages that include a '/' were no longer accessible
...
Closes #1363
2015-04-07 09:10:11 -07:00
45ca39e81b
Merge remote-tracking branch 'github.com/master'
2015-04-04 14:23:32 +02:00
6237cae1f1
Add admin deploy keys tests.
2015-04-03 12:51:01 +02:00
9b3624071e
Add project deploy keys tests.
2015-04-03 12:40:14 +02:00
d365004e68
Fix and improve help rendering
2015-04-03 11:56:50 +02:00
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
f8f9750323
Merge branch 'username-period' into 'master'
...
Don't allow username to end in period.
The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174 .
See merge request !438
2015-04-02 20:28:23 +00:00
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
b7e2be247f
Fix adding new members to group
2015-03-30 14:17:49 -07:00
9d6ffcfa5f
Refactor star btn logic for non-logged in user and fix tests
2015-03-29 18:50:45 -07:00
1d829ca151
Fix tests.
2015-03-27 11:10:56 +01:00
c1c93f4f7a
Fix tests and unassigned filter for issues. Updated CHANGELOG
2015-03-27 00:27:51 -07:00
546dab6da9
Fix broken side-by-side diff view on merge request page
...
Closes #1294
2015-03-25 23:39:34 -07:00
eecd897170
Fix code unfold not working on Compare commits page
...
Closes #1274
2015-03-24 00:19:41 -07:00
Stan Hu
Dmitriy Zaporozhets
Robert Speicher
Jeroen van Baarsen
Douwe Maan
Nicolas
Maran
Hannes Rosenögger
Sullivan SENECHAL
