Commit Graph
2295 Commits
Author SHA1 Message Date
Drew Blessing f4ec906e90 Use devise paranoid mode and ensure the same message is returned every time
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
2015-12-09 18:40:37 -06:00
Douwe Maan 28351806aa Give merge request widget the vars it desires 2015-12-09 09:59:30 +01:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
2015-12-09 09:00:25 +01:00
Dmitriy Zaporozhets 9dd2674963 Fix only 20 group members showing on project member page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-09 01:43:57 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master'
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
2015-12-09 00:05:23 +00:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
2015-12-08 22:04:52 +00:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master'
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
2015-12-08 17:06:11 +00:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master'
Languages graph

See merge request !2009
2015-12-08 16:56:39 +00:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Douwe Maan f39ff54290 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 16:18:18 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master'
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
2015-12-08 14:19:52 +00:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan a17ba43bfd Move commit builds to partial 2015-12-08 13:10:33 +01:00
Douwe Maan 9907a7e6ed Get ci_commit in MR controller 2015-12-08 13:06:55 +01:00
Douwe Maan 86a09cfaf1 builds_enabled rather than ci_enabled 2015-12-08 13:06:53 +01:00
Dmitriy Zaporozhets 9b561e7e15 Implement languages graph page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 02:35:34 +01:00
Dmitriy Zaporozhets 949a7e8e20 Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce 2015-12-07 20:17:29 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Douwe Maan a468bf346a Merge branch 'gsmethells/gitlab-ce-sort-by-due-date' 2015-12-07 13:45:16 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 12:26:56 +00:00
Douwe Maan 104df74f51 Merge branch 'fix-global-milestones-error-500' into 'master'
Fix Error 500 when creating global milestones with Unicode characters

Two issues:

1. The constraints in the resources were incorrect. Here's what it was before:

```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

In this case, id is actually the title of the milestone, which can be anything at the moment.

After:
```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:

```
ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
```

This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.

Closes https://github.com/gitlabhq/gitlabhq/issues/9881

See merge request !1983
2015-12-07 11:45:10 +00:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +01:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Stan Hu d800a949d2 Fix Error 500 when creating global milestones with Unicode characters
Two issues:

1. The constraints in the resources were incorrect. Here's what it was before:
```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

In this case, id is actually the title of the milestone, which can be anything at the moment.

After:

```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:

ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):

This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.

Closes https://github.com/gitlabhq/gitlabhq/issues/9881

Fix constraints
2015-12-05 00:04:44 -08:00
Stan Hu a120b78940 Handle and report SSL errors in Web hook test. Check for status 200 for success.
If a Web hook test fails due to an SSL error or some other error, report
the result back to the user instead of an Error 500.

Closes #3656

Handle response
2015-12-04 07:13:28 -08:00
Douwe Maan a89d6d1428 Add authorization to new branch/tag pages. 2015-12-03 18:53:17 +01:00
Marin Jankovski ea52a81da4 Move the file serving to Raw controller, add a few ifs to view. 2015-12-03 17:08:09 +01:00
Greg Smethells dbbd2b863b sort milestones by due_date 2015-12-03 08:53:34 -06:00
Marin Jankovski 0a081e7eff If a user clicks on the LFS object, it should be served if the user has access to the object. 2015-12-03 14:59:10 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00
Grzegorz Bizon bfce5d7168 Render json message with errors if note didn't pass validation 2015-12-03 13:38:59 +01:00
Andrew Tomaka ec754d2213 Be more explicit with the impersonate return URL 2015-12-02 13:21:07 -05:00
Andrew Tomaka daca985a6e Prevent impersonation if blocked 2015-12-02 08:07:29 -05:00
Dmitriy Zaporozhets 3f5e999fe7 Merge pull request #9846 from fbeegle/master
Update autocomplete_controller to be more readable
2015-12-02 10:02:15 +01:00
Stan Hu a518879a6f Merge pull request #9868 from yms9654/commit-without-whitespace
Add ignore whitespace change option to commit view
2015-12-01 00:30:39 -08:00
Minsik Yoon 8c4a3c77d8 Add ignore whitespace change option to commit view 2015-12-01 09:51:10 +09:00
Robert Speicher 244c9a00e0 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
2015-11-30 12:00:13 -05:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
2015-11-30 16:49:09 +00:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Jose Corcuera b9df1a6355 Strip attributes for Milestone and Issuable. #3428 2015-11-26 10:16:50 -05:00
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
Stan Hu 2497d3d550 Fix 404 in redirection after removing a project
Closes https://github.com/gitlabhq/gitlabhq/issues/9844

Closes #3559
2015-11-25 23:11:35 -08:00
Douglas Barbosa Alexandre 8dcef120cd Fix raw private snippets access workflow 2015-11-25 18:16:27 -02:00
Zeger-Jan van de Weg 8608c6325e Refactor MergeWhenBuildSucceedsService and incorporate feedback 2015-11-23 10:11:54 +01:00
Felipe Orlando 075e3661c5 Update autocomplete_controller to be more readable 2015-11-22 06:04:20 -02:00