5a8873f362
Merge branch 'rs-diff_view' into 'master'
...
Always read diff_view setting from the cookie
Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.
The cookie is set whenever the view is changed, so this value should
always be up-to-date.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285
See merge request !3732
2016-04-22 07:49:46 +00:00
338f6f0902
Merge branch 'issue_5838' into 'master'
...
Show project members only for members
fixes #5838
See merge request !3752
2016-04-21 10:31:20 +00:00
9581aba4d4
Add changelog entry and fix convention in a spec
2016-04-20 12:41:35 -03:00
8530ce4c6f
Clarify that the diff view setting always comes from the cookie
...
This invalidates one test, which we've removed.
2016-04-19 17:47:58 -04:00
f2e3868124
Check permissions when sharing project with group
...
Closes #15330
2016-04-19 12:15:56 +02:00
0b91ff287d
Projects members tab should follow visibility levels
2016-04-18 17:53:34 -03:00
62f6601c59
Show project members only for members
2016-04-18 17:53:34 -03:00
8ea6c6d80c
Merge branch 'issue_15044' into 'master'
...
Allow to close invalid merge request
fixes #15044
See merge request !3664
2016-04-13 09:10:57 +00:00
a64f1c7636
Add changelog entry, improve specs and model code
2016-04-12 15:52:03 -03:00
61a62e00e3
Fix specs for Projects::NotificationSettingsController
2016-04-12 12:57:39 -03:00
aabb466e5b
Improve specs for group/project notification controller
2016-04-12 12:10:59 -03:00
bee28e1785
Requires user to be signed in when changing notification settings
2016-04-11 20:50:26 -03:00
476cf23fc3
Allow to close invalid merge request
2016-04-11 19:00:59 -03:00
924e4b3700
Return status code 303 after a branch DELETE operation to avoid project deletion
...
Closes #14994
2016-04-06 21:11:10 -07:00
bb9c194c23
Respond 404 when unauthorized user imports members
2016-04-05 14:37:06 +02:00
c52b5c92fb
Do not leak project exists when importing members
...
When importing members, and user does not have permissions to read
members in a source project, do not leak information about source
project existence. Notifiy user that project has not been found instead.
2016-04-05 13:55:15 +02:00
b248ee9381
Check permissions when importing project members
...
Closes #14899
2016-04-05 13:32:28 +02:00
808bcf5bc6
Fixed MergeRequestController spec
2016-03-30 00:02:32 -03:00
f4bdefdff1
Ensure private project snippets are not viewable by unauthorized people
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 .
2016-03-25 12:33:42 +01:00
ae7b2ef62c
Merge branch 'master' into issue_12658
...
# Conflicts:
# app/models/issue.rb
# app/views/projects/_home_panel.html.haml
# app/views/shared/projects/_project.html.haml
# db/schema.rb
# spec/models/project_spec.rb
2016-03-21 23:22:21 +01:00
6e5461c6ee
Merge branch 'master' into 2489-soft-delete-issues
2016-03-21 19:32:37 +01:00
d28a587e82
Fix typos and denting
2016-03-21 19:30:45 +01:00
3b088fc5b5
Minor improvements on IssuableActions
2016-03-21 16:59:35 +01:00
261569b246
Fix specs
2016-03-21 09:09:59 +01:00
295fdf720a
Create repositories in IssuesController specs
...
In the real world a project always has a repository. This fact allows
code such as Issue#related_branches to work without explicitly checking
if a repository exists.
2016-03-19 21:54:08 +01:00
1d77822816
minor improvements and fixed specs
2016-03-19 21:24:05 +01:00
7342a4566c
Dry destroy action on issuables
2016-03-19 21:24:05 +01:00
212e83bab3
Soft delete issuables
2016-03-19 21:23:03 +01:00
34ee75379c
Restrict access to confidential issues
2016-03-17 20:55:38 -03:00
2b97c92119
Incorporate review
2016-03-15 20:21:11 +01:00
ad97bebfed
Enhance new branch button on an issue
2016-03-15 20:21:11 +01:00
5352ec2e21
Fix denting and spec
2016-03-13 13:44:31 +01:00
cb81c8a5ef
Merge branch 'rs-issue-12944' into 'master'
...
Use a custom Devise failure app to handle unauthenticated .zip requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
See merge request !2828
2016-03-11 22:34:33 +00:00
5844a21a0a
Use a custom Devise failure app to handle unauthenticated .zip requests
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
2016-03-08 23:49:30 -05:00
b900304c38
Make better use of the `visibility_level` factory traits
2016-03-08 16:40:45 -05:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
49e4ef3b41
Add specs to ForksController#index.
...
* Also refactor query to get projects accessible for current user.
ProjectsFinder actually return public projects when no user is passed.
2016-03-02 12:35:56 -05:00
dfca5bfa47
Move a few controller specs to their correct locations
2016-02-18 21:50:49 -05:00
2770de9617
Reopened MRs should also be considered as open.
2016-02-17 21:15:13 -05:00
879d66b6ab
Merge branch 'git-archive-refactor' into 'master'
...
Refactor 'git archive' hand-off to gitlab-workhorse
We have a nicer way now to hand off HTTP responses to gitlab-workhorse.
Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36
See merge request !2675
2016-02-17 17:16:34 +00:00
3d3ac87af9
Redirect /import to project page if no importing at all and repo exists
...
Fixes #13367 .
2016-02-17 15:05:44 +01:00
a0ccb0731b
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor
2016-02-17 11:30:42 +01:00
f5ab126fd0
Ensure Commit#show responds 404 instead of 500 when given an invalid ID
...
Closes #13467
2016-02-15 15:48:16 -05:00
551ce0f245
Add spec for assigning view param from cookie
2016-02-05 16:03:20 -05:00
f6d816f9fe
Add a controller test for the new 'diff_view' cookie
2016-02-05 15:40:44 +01:00
771f14b96e
First version of "git archive" headers
2016-02-02 14:09:55 +01:00
46c36e0e01
Fixi import redirect loop
2016-01-25 21:00:23 -02:00
41b8a238ce
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2016-01-07 12:56:18 +01:00
3639ebd081
Fix specs
2015-12-18 17:09:58 +01:00
d9c82d679f
Automatically fork a project when not allowed to edit a file.
2015-12-18 10:03:34 +01:00
Rémy Coutable
Felipe Artur
Robert Speicher
Grzegorz Bizon
Douglas Barbosa Alexandre
Stan Hu
Gabriel Mazetto
Douwe Maan
Zeger-Jan van de Weg
Yorick Peterse
Zeger-Jan van de Weg
Douwe Maan
Jacob Vosmaer
Rubén Dávila