home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,335 Commits 48 Branches 340 Tags
d63371ad783db055da840be37ddac0cdcb49db2c
Commit Graph
786 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 541f7675f9 Merge branch 'fix-diff-patch-public-mr' into 'master' 
Fix downloading of patches on public merge requests when user logged out

### What does this MR do?

This MR makes it possible to download a diff patch on a public merge request when a user is logged out.

### Why was this MR needed?

An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button:

```
NoMethodError - undefined method `id' for nil:NilClass:
  lib/gitlab/backend/shell_env.rb:9:in `set_env'
  lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite'
  lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite'
  app/models/merge_request.rb:219:in `to_diff'
  app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show'
```

### What are the relevant issue numbers?

* Closes #1225
* Closes #1854 (dup)
* Closes #1858 (dup)

See merge request !872
 2015-06-23 15:03:00 +00:00
Dmitriy Zaporozhets 94f130cbfc Merge branch 'admin-edit-identities' into 'master' 
Admin can see, edit and remove user identities

Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !843
 2015-06-23 14:24:16 +00:00
Dmitriy Zaporozhets 4acd1f5d6a Fix tests for admin identities after migrate to rspec3 2015-06-23 15:49:15 +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 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02: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 due to the purge of `gitlab_logo.png`.

See merge request !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 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
Dmitriy Zaporozhets 3fe3cbf222 Fix indendity test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:52:22 +02: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 SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Douwe Maan 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
Stan Hu e785b9d2e2 Fix Error 500 when one user attempts to access a personal, internal snippet 
Closes #1815
 2015-06-19 21:23:46 -07: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
Dmitriy Zaporozhets 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
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
Douwe Maan 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

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png)

See merge request !810
 2015-06-16 14:43:15 +00: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
Douwe Maan 63969337a9 Merge branch 'applications_form' into 'master' 
Fix UI issues in Applications form

@douwe Thanks for reviewing this small fix.

---

Before:

![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png)

---

After:

![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png)

See merge request !1859
 2015-06-16 11:50:13 +00:00
Nicolas 4cf7d8d956 Fix consistency issues on New Application page. 2015-06-15 21:27:20 +02:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04: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
Nicolas ebe4963871 Move Project Members link from Settings to main menu. 
Addresses #2278.
 2015-06-09 14:45:38 +02:00
Dmitriy Zaporozhets 5b4ab5a0ca Properly click on user profile picture 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 18:20:00 +02:00
Dmitriy Zaporozhets 8ee57adc8a Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 17:29:27 +02:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Dmitriy Zaporozhets 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**

![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
 2015-05-29 15:01:54 +00:00
Dmitriy Zaporozhets 85de253ee1 Fix tests for group leave feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 15:07:04 +02: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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 9e50f28ee9 Fix profile tests after header rename 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 15:32:28 +02:00
Jeroen van Baarsen 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
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
Douwe Maan 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
Douwe Maan e6f282e0f1 Fix spec. 2015-05-27 14:23:04 +02: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.

![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
 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