Robert Speicher
f3d4767d0c
Rename notice_added_references to create_new_cross_references!
2015-07-13 21:31:16 -04:00
Robert Speicher
e4c698fd5c
Refactor Mentionable#notice_added_references
...
It now accounts for models that have changed but have already been
persisted, such as when called from an UpdateService.
Closes #1773
2015-07-13 21:31:00 -04:00
Dmitriy Zaporozhets
00053c805c
Merge branch 'ssh-key-linebreaks' into 'master'
...
Add error message for SSH key linebreaks
Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key ).
See merge request !672
2015-07-13 09:33:55 +00:00
Dmitriy Zaporozhets
171d6fccae
Merge branch 'rs-disable-2fa-by-admin' into 'master'
...
Allow admins to disable 2FA for a user
> 
Depends on !961
See merge request !962
2015-07-13 08:49:46 +00:00
Dmitriy Zaporozhets
d93da8bed5
Merge branch 'rs-disable-2fa' into 'master'
...
Add User#disable_two_factor!
This method encapsulates all the logic for disabling 2FA on a specific
User model.
See merge request !961
2015-07-13 08:47:55 +00:00
Dmitriy Zaporozhets
10d5da784b
Merge branch 'fix-api-project-transfer' into 'master'
...
Fix transferring of project to another group using the API.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397 .
See merge request !926
2015-07-13 08:42:42 +00:00
Dmitriy Zaporozhets
d3d1e9ef65
Merge branch 'search-git-grep' into 'master'
...
Implement faster search of code (via git grep)
Much faster than iterating over each file using rugged.
Performance compare for Linux repository using keyword `sha`:
```
OLD: 250 seconds
NEW: 9 seconds
```
See merge request !957
2015-07-12 13:03:12 +00:00
Dmitriy Zaporozhets
ec19a960ca
Add tests for repository search files
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-12 14:32:25 +02:00
Douwe Maan and Robert Speicher
29cbb2f078
Update specs.
2015-07-11 16:47:33 -04:00
Nikita Verkhovin
562d78a65a
Add error message for SSH key linebreaks
2015-07-12 00:18:56 +06:00
Stan Hu
96644c1fc1
Better handle unknown projects and groups for autocomplete
2015-07-11 06:19:32 -07:00
Hannes Rosenögger
d0b240136a
Merge branch 'fix-autocomplete-with-public-projects' into 'master'
...
Fix user autocomplete for unauthenticated users accessing public projects
Closes #1955
See merge request !963
2015-07-11 12:54:09 +00:00
Stan Hu
0b67d7a0fe
Fix user autocomplete for unauthenticated users accessing public projects
...
Closes #1955
2015-07-10 17:39:58 -07:00
Robert Speicher
db8f4c0606
Add a button to Admin::Users#show to disable 2FA for that user
2015-07-10 17:18:33 -04:00
Robert Speicher
800df45db2
Add disable_two_factor route for Admin::Users
2015-07-10 17:18:17 -04:00
Robert Speicher
22724418d3
Add User#disable_two_factor!
...
This method encapsulates all the logic for disabling 2FA on a specific
User model.
2015-07-10 16:18:30 -04:00
Dmitriy Zaporozhets
bda04bc687
Merge branch 'fork_visibility_level' into 'master'
...
Forks should not have more permissive visibility levels than the original
https://dev.gitlab.org/gitlab/gitlabhq/issues/2286
See merge request !936
2015-07-10 12:05:54 +00:00
Dmitriy Zaporozhets
fdbaffdc08
Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce
2015-07-10 13:13:02 +02:00
Darby
360ee25ddb
Fixed the issues
2015-07-09 13:38:33 -07:00
Dmitriy Zaporozhets
27a9ff8264
Merge branch 'rs-dev-issue-2372' into 'master'
...
Filter by issues/merge requests without a milestone
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372
See merge request !886
2015-07-08 21:42:29 +00:00
Stan Hu and Robert Speicher
098ced4faa
Improve features to ensure Ajax filter has actually executed
2015-07-08 15:57:24 -04:00
Robert Speicher
098ad0a5b4
Remove "mystery guest" from Milestone filtering features
2015-07-08 15:49:37 -04:00
Dmitriy Zaporozhets
f76092c06d
Merge branch 'settings-via-api' into 'master'
...
API to set application settings for admin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !934
2015-07-07 10:57:41 +00:00
Robert Speicher
cf7c57aaf5
Use stub_application_setting in a few more specs
...
These specs also failed when run by themselves before this change, so
we've likely got some kind of cross-test contamination going on.
2015-07-06 22:39:56 -04:00
Robert Speicher
4b4351a18c
Add feature tag to feature specs
...
Not to be confused with the RSpec `type: :feature` tag, this tag is used
by the `spec:feature` Rake task for filtering/grouping specs.
2015-07-06 22:39:55 -04:00
Robert Speicher
d00cb00d6b
Rename NoMilestone to Milestone::None
...
Also refactors IssuableFinder to avoid redundant title check.
2015-07-06 22:39:55 -04:00
Robert Speicher
cfd813402d
Remove duplicate feature spec for filtering issues by no milestone
2015-07-06 22:39:55 -04:00
Robert Speicher
3ee3cb24d4
Allow user to filter by Issues/Merge Requests without a Milestone
2015-07-06 22:39:55 -04:00
Stan Hu
4254f09eaa
Return 40x error codes if branch could not be deleted in UI
2015-07-06 09:47:22 -07:00
Dmitriy Zaporozhets
603ceea21a
Add tests and improve logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-06 16:47:19 +02:00
Valery Sizov
111ebe5471
Fork visibility level fix
2015-07-06 17:40:33 +03:00
Dmitriy Zaporozhets
b28714b6a9
Add docs and empty specs for applicaiton settings API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-06 15:53:08 +02:00
Dmitriy Zaporozhets
f3590c83ea
Merge branch 'audit_log' into 'master'
...
Audit log for user authentication
https://dev.gitlab.org/gitlab/gitlabhq/issues/2318
See merge request !931
2015-07-06 10:09:53 +00:00
Valery Sizov
411829fdb5
Audit log for user authentication
2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets
5f52d6a038
Merge branch 'add-irker-options' into 'master'
...
Add Irker service configuration options
### What does this MR do?
This MR makes a number of hard-coded Irker parameters configurable in the service settings: Irker server host, port, and default IRC URI. It also removes the "max recipient" limit since the recipient list is configurable only by the project owner, and it makes no sense to update the limit when it is implied in the recipient list already.
### Why was this MR needed?
The existing service assumed that gitlab.com was running an Irker daemon on `localhost` when it was not. Using Irker on gitlab.com thus did not work at all. This MR allows users to provide their own Irker daemons.
### Are there points in the code the reviewer needs to double check?
My main concern is whether allowing a user to specify the server/port combination would have security implications for a host. Given that HipChat and Slack allow users to do this, I didn't think this was doing anything novel.
### What are the relevant issue numbers?
* Closes #1713
* Closes #1714
* Closes gitlab-com/support-forum#139
### Screenshots
### Before
### After
See merge request !930
2015-07-06 08:57:16 +00:00
Stan Hu
d4be82d1c9
Add Irker service configuration options
...
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
2015-07-05 06:40:56 -07:00
Steve Norman
b3a751112d
Allow user to be blocked and unblocked via the API
2015-07-03 11:17:57 +00:00
Stan Hu
3e738e3b9a
Add support for unlocking users in admin settings
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
2015-07-02 04:22:51 -07:00
Darby
c611b6f623
Comment box/Placeholder text redo
2015-07-01 15:49:31 -07:00
Dmitriy Zaporozhets
2e6bbb12f8
Refactor can_be_merged logic for merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-01 17:24:03 +02:00
Stan Hu
9add3e6eb5
Extract the longest-matching ref from a commit path when multiple matches occur
...
Closes #1839
2015-07-01 07:01:59 -07:00
Dmitriy Zaporozhets
2d85458ac7
Merge branch 'fix-zero-sha-lookup' into 'master'
...
Repository#blob_at should return nil for 00000000... sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !916
2015-07-01 09:30:43 +00:00
Dmitriy Zaporozhets
87df927f20
Merge branch 'reporter-manage-issues' into 'master'
...
Reporter role can manage issue tracker now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !908
2015-07-01 09:19:56 +00:00
Dmitriy Zaporozhets
baf12f45d8
Repository#blob_at should return nil for 00000000... sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-01 11:02:37 +02:00
Robert Speicher
42b643f057
Fix ApplicationHelper specs
...
There were several specs that were failing when run by themselves.
- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module
2015-06-30 17:47:53 -04:00
Robert Speicher
366799bbf1
Add spec/support/factory_girl
...
Just for consistency with our Capybara, DatabaseCleaner, WebMock, etc.
setups.
2015-06-30 17:47:53 -04:00
Dmitriy Zaporozhets
a5b54f919a
Reporter role can manage issue tracker now
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-30 13:33:02 +02:00
Dmitriy Zaporozhets
88162f6970
Merge branch 'fix-relative-submodule-namespace-path' into 'master'
...
Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path
### What does this MR do?
This MR fixes a bug in resolving a namespace when the `name` differed from `path`.
### Why was this MR needed?
The original code was using `name`, when the proper input to `namespace_project_path` was `path`.
### What are the relevant issue numbers?
Closes #1849
See merge request !864
2015-06-29 14:04:04 +00:00
Robert Speicher
f6503f71f9
Remove disableButtonIf[Any]EmptyField calls from forms
...
These have been replaced by the "requiresInput" behavior.
2015-06-26 22:07:59 -04:00
Robert Speicher
e4472cee78
Add "Requires Input" JS behavior
2015-06-26 22:06:42 -04:00
Robert Speicher
Dmitriy Zaporozhets
Douwe MaanandRobert Speicher
Nikita Verkhovin
Stan Hu
Hannes Rosenögger
Darby
Valery Sizov
Steve Norman
