3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
44ac823e59
Improve tests to use real branches in merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +02:00
411829fdb5
Audit log for user authentication
2015-07-06 12:36:08 +03:00
56246b70fb
Fix Style/TrailingBlankLines cop violations
2015-06-22 14:38:33 -04:00
94d3c1433d
Add RootController
...
This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.
2015-06-13 17:59:11 -04:00
821fc4b034
Add Profiles::PreferencesController
2015-06-13 17:58:15 -04:00
6e5473f930
Remove show actions from Admin and Project DeployKeys
2015-06-03 18:03:04 -04:00
f46b367068
Add MergeRequests#commits action and route
...
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
2015-05-29 00:09:28 -04:00
5f3b2be8a0
Fix snippet test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-22 20:12:52 +03:00
2d4ffce826
Loosen help page parameter constraints for category
2015-04-15 13:15:18 -04:00
e24cb79f31
Add constraints to help#show route parameters
2015-04-15 12:25:37 -04:00
ef47ea3d39
Revert "Fix and improve help rendering"
...
This reverts commit d365004e68
2015-04-15 12:24:44 -04: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
a243e44ca1
Fix failing specs.
2015-04-03 12:23:20 +02:00
d365004e68
Fix and improve help rendering
2015-04-03 11:56:50 +02:00
31fc73f0a9
Use `project_member` instead of `team_member`.
2015-03-15 13:50:38 +01:00
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
0c4a70a306
Updated rspec to rspec 3.x syntax
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
639c93b4f2
Don't have Markdown preview fail for long content by using POST rather than GET.
...
See https://github.com/gitlabhq/gitlabhq/issues/8611 .
2015-02-06 11:23:12 +01:00
90ba3a385c
Fix tests for blobs refactoring
2015-01-26 16:08:59 -08:00
70c44a0da2
Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable
2015-01-24 18:51:16 +01:00
42bac7f9f2
adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
2015-01-24 18:51:16 +01:00
6a5766e370
Merge pull request #7978 from cirosantilli/edit-preview-route-test
...
Add tests for tree edit routes
2014-12-20 20:17:25 +02:00
65b858a776
Merge branch 'show_files_with_diff_name' into 'master'
...
Show files named diff
Fixes #1749
See merge request !1318
2014-12-11 14:07:12 +00:00
22368fb8e8
Add a failing route spec for file named diff.
2014-12-10 15:52:56 +01:00
742e6eeed2
Merge branch 'upstream-master' into markdown-preview
...
Conflicts:
spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
d2c3c98e3c
Routing specs for fork projects
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-14 12:55:13 +02:00
cd3eabd712
Use GET instead of POST for Markdown previews
2014-10-16 22:45:13 -05:00
5700842ba8
Add Markdown preview to more forms
...
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
2014-10-15 23:52:33 -05:00
f4efb19038
Add tests for tree edit routes
...
Critical because of possible confusion between /:id/preview
and /:id for a path that ends in preview.
2014-10-07 10:04:09 +02:00
d593c98fcb
Delete wall notes tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:29:26 +03:00
f07f524bad
Fix for the broken routing specs
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-08 23:42:09 +02:00
c1551c6ed0
Fix routing tests.
2014-05-29 08:58:15 +02:00
a3d8be09c6
Fix can not automerge if description is too long
2014-05-11 23:50:14 +09:00
61ef72e5d1
Fixes to group route tests, thanks DZ
2014-04-15 10:40:37 +02:00
bb7df7663a
Add short path route for groups.
2014-04-13 17:46:41 +02:00
29cfd33d94
Add email aliases for users
...
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.
Notifications are sent when an email is added.
2014-02-13 22:59:39 -06:00
b1492a2a62
sync with upstream for ease to merge
2014-02-06 19:47:21 +05:30
1c9a41e0d5
adding tests for the ssh keys feature
2014-02-06 14:42:59 +05:30
71c157e43b
Add files to path blacklist.
...
Remove empty ErrorsController
2014-01-24 20:06:44 -06:00
7cc2520541
Add support for various archive formats.
...
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
2014-01-02 10:18:56 -06:00
b08608b261
Issue 5716 - Allow removal of avatar
...
Add class and style
Add spinach tests
Add entry to CHANGELOG
Add entry to CHANGELOG
2013-12-02 16:20:34 -06:00
05c988419f
Expand refs constraints to include valid characters
...
Fixes #4831 , #4865 , #4932
2013-10-24 16:31:15 +11:00
dd68e37db3
Fix profile specs
2013-10-09 19:03:09 +03:00
df9cbbc924
Drop support of root namespace in routing
2013-09-13 07:00:24 +09:00
eb4272e2f5
Remove old specs
2013-08-27 22:00:41 +03:00
d2284b4112
Fix routing specs
2013-07-17 08:43:56 +03:00
ee890f2b2a
Merge branch 'master' into 6-0-dev
...
Conflicts:
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb
2013-07-02 11:47:09 +03:00
b62c9e5991
Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning
2013-07-01 10:48:01 +01:00
Dmitriy Zaporozhets
Valery Sizov
Robert Speicher
Douwe Maan
Sullivan SENECHAL
Vinnie Okada
Jeroen van Baarsen
Hannes Rosenögger
Steven Thonus
Dmitriy Zaporozhets
Marin Jankovski
Ciro Santilli
Marin Jankovski
sue445
GitLab
Jason Hollingsworth
GitLab
Drew Blessing
Peter Fern
Hiroyuki Sato
Jack Weeden
