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
1a3283d4e8
Merge branch 'gravatar-host-link' into 'master'
...
link to configured gravatar host on profile page
This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.
See merge request !1093
2015-08-09 22:42:07 +00:00
7a9d432cdb
Add abuse report management in admin area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 15:08:22 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
0f785bbc7e
ink to configured gravatar host on profile page
2015-08-05 00:48:16 -07:00
0c1ccda43f
Add "Confirm user" button in user admin page
...
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-05 00:35:53 -07:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
c1c89500f3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-03 11:04:20 +02:00
87df06171e
Bump redis-store to 1.1.6 and remove redid-store-fix-expiry
2015-07-31 15:53:58 +02:00
05b518aa4d
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-29 15:44:04 +02:00
0be6debb0b
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-27 11:22:35 +02:00
d371331a65
Remove weird trailing characters
2015-07-24 18:55:50 +02:00
39a7e210a3
Use a separate backup test directory and nuke its contents
2015-07-24 18:54:06 +02:00
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
8fa9da49c4
Merge branch 'set-omniauth-full-host' into 'master'
...
Set OmniAuth full_host parameter to ensure redirect URIs are correct
### What does this MR do?
This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host.
### Why was this MR needed?
[OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/ ) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com ), omniauth will use the internal URL (e.g. http://my-host:8080 ) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start.
### What are the relevant issue numbers?
Closes #1967
See merge request !991
2015-07-20 08:45:58 +00:00
19163f84fb
Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in
...
Closes #1612
2015-07-18 15:57:11 -07:00
5f4dcbf8be
Set OmniAuth full_host parameter to ensure redirect URIs are correct
...
Closes #1967
2015-07-17 16:24:19 -07:00
a84ed6eb23
Merge branch 'add-support-remove-milestone' into 'master'
...
Add support for destroying project milestones
### What does this MR do?
This MR adds a "Remove" button to the project milestones page and the milestone page itself.
### Why was this MR needed?
Because lots of people talked about needing to clean their toilets. :)
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
### Screenshots
See merge request !980
2015-07-17 17:15:27 +00:00
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
a7fded9b95
Huge refactoring for accepting merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
82bb5c5e03
Expire Rails cache entries after two weeks
...
This should help prevent endless Redis growth.
2015-07-15 13:53:40 +02:00
800df45db2
Add disable_two_factor route for Admin::Users
2015-07-10 17:18:17 -04:00
d192f921c1
Move project activity to separate tab. Add more features to project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 16:01:12 +02:00
bb50b7fcd0
Allow custom backup archive permissions
...
This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.
2015-07-06 18:43:17 +02:00
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
411829fdb5
Audit log for user authentication
2015-07-06 12:36:08 +03:00
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
c83bbfa79e
Enable rack profiler by default
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:48:59 +02:00
cc04c5b828
Refactor admin user page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 17:12:20 +02:00
d059c69db7
Move identities list to own controller action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
270b7ce810
Add ability for admin to edit user identity
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
228da2dd28
Admin can see and remove user identities
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:52 +02:00
c6c3577bc6
Use explicit if.
2015-06-16 13:44:52 +02:00
4c317531b4
If kerberos is enabled require it.
2015-06-15 18:04:30 +02: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
5f20574db5
Fix a few remaining references to the old Theme names/IDs
2015-06-13 17:58:17 -04:00
844d72716e
Add Gitlab::Themes module; remove Gitlab::Theme
...
Now we can simply loop through all themes, among other things.
This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
2015-06-13 17:58:16 -04:00
0c0c31ff34
Move the "Design" templates and logic to Preferences
2015-06-13 17:58:16 -04:00
821fc4b034
Add Profiles::PreferencesController
2015-06-13 17:58:15 -04:00
567a25b630
Ensure `session_expire_delay` field exists before accessing it
...
Closes #1798
2015-06-13 00:31:08 -04:00
9ea8dcb5e2
Merge branch 'feature-session-expire-seconds-ui' into 'master'
...
Add session expiration delay configuration through UI application
Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)
Answers the following suggestions:
* http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
* http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle
See merge request !774
2015-06-12 13:50:40 +00:00
df346e9507
Add a note that changing example configuration files requires changing omnibus-gitlab.
2015-06-11 15:11:37 +02:00
1d080f5745
session_expire_seconds => session_expire_delay
...
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
2015-06-10 22:10:00 -04:00
cd522f3309
remove extra space
2015-06-09 17:59:08 +02:00
bf7315cb13
update fog to 1.25.0 and add multipart upload support
2015-06-09 17:56:37 +02:00
84a414fe53
Add session expiration delay configuration through UI application
...
settings
2015-06-05 11:50:37 -04:00
3f59a8f0be
Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'
2015-06-05 13:34:25 +02:00
6e5473f930
Remove show actions from Admin and Project DeployKeys
2015-06-03 18:03:04 -04:00
Dmitriy Zaporozhets
Stan Hu
Ben Bodenmiller
Kamil Trzcinski
Jacob Vosmaer
Douwe Maan
Marin Jankovski
Robert Speicher
Valery Sizov
Marin Jankovski
themaze75
Jeroen Nijhof
Eric Maziade
