Commit Graph
1822 Commits
Author SHA1 Message Date
Robert Speicher bf44988a30 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.

cherry-picked
2015-06-16 12:51:51 -04:00
Robert Speicher 7f702b33b9 Add dashboard attribute to User model
cherry-picked
2015-06-16 12:51:46 -04:00
Robert Speicher 59ab9cc9fc Remove js handler from Profiles#update
It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update

cherry-picked
2015-06-16 12:51:34 -04:00
Robert Speicher 3cae81a597 Move the "Design" templates and logic to Preferences
cherry-picked
2015-06-16 12:51:23 -04:00
Robert Speicher 471ea73a56 Add Profiles::PreferencesController
cherry-picked
2015-06-16 12:51:02 -04:00
Dmitriy Zaporozhets 21a62bb995 Merge branch 'refactor-mr-widget' into 'master'
Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !799
2015-06-12 08:22:13 +00:00
Dmitriy Zaporozhets c69ca9912e Merge pull request #9371 from zenati/patch-2
An `in_namespace` scope is already present
2015-06-11 23:09:41 +02:00
Dmitriy Zaporozhets 946b4ceda3 Improve variables in mr widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:45:12 +02:00
Dmitriy Zaporozhets 8893ac4ba4 Fix rubocop
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:35:43 +02:00
Dmitriy Zaporozhets 00600a592b Extract merge request widget JS to separate class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:27:03 +02:00
Dmitriy Zaporozhets d2d8037b1a Refactor merge request widget step 2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 15:14:50 +02:00
Dmitriy Zaporozhets 269c2d2efc Merge branch 'move_project_members_link' into 'master'
Move Project Members link from Settings to main menu.

Addresses #2278.

See merge request !1846
2015-06-09 18:23:35 +00:00
Nicolas ebe4963871 Move Project Members link from Settings to main menu.
Addresses #2278.
2015-06-09 14:45:38 +02:00
zenati b0de6e9ae2 An in_namespace scope is already present 2015-06-09 13:42:01 +02:00
Dmitriy Zaporozhets 6267a6b999 Merge branch 'ldap-remember-me' into 'master'
Add "Remember me" checkbox to LDAP signin form.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2127.

See merge request !772
2015-06-09 10:52:30 +00:00
Dmitriy Zaporozhets 87f9c475db Merge branch 'refactor-web-editor' into 'master'
Refactor web editor

* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #1761

See merge request !773
2015-06-05 16:14:34 +00:00
Dmitriy Zaporozhets dfccb06dda Refactor web editor
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-05 15:01:38 +02:00
Douwe Maan 44458f3ca2 Add "Remember me" checkbox to LDAP signin form. 2015-06-05 14:37:01 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Dmitriy Zaporozhets 7bab4817f7 Merge branch 'repo-remove' into fix-group-remove
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
2015-06-03 15:15:46 +02:00
Dmitriy Zaporozhets 61cfd1d273 Wrap group removal into service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 14:07:20 +02:00
Dmitriy Zaporozhets 97ff86e07c Move repository when project is removed
Ths commit does next:

* When we remove project we move repository to path+deleted.git
* Then we schedule removal of path+deleted with sidekiq
* If repository move failed we abort project removal

This should help us with NFS issue when project get removed but
repository stayed. The full explanation of problem is below:

* rm -rf project.git
* rm -rf removes project.git/objects/foo
* NFS server renames foo to foo.nfsXXXX because some NFS client (think
* Unicorn) still has the file open
* rm -rf exits, but project.git/objects/foo.nfsXXX still exists
* Unicorn closes the file, the NFS client closes the file (foo), and the
* NFS server removes foo.nfsXXX
* the directory project.git/objects/ still exists => problem

So now we move repository and even if repository removal failed

Repository directory is moved so no bugs with project removed but
repository directory taken. User still able to create new project with
same name. From administrator perspective you can easily find stalled
repositories by searching `*+deleted.git`

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 13:05:43 +02:00
Douwe Maan d99637bf69 Merge branch 'feature/sso_integration' into 'master'
Add an option to automatically sign-in with an Omniauth provider

Split of !669 as requested

This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.

See merge request !723
2015-06-02 08:50:54 +00:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Alex Lossent 5491f6fbde Add an option to automatically sign-in with an Omniauth provider without showing the GitLab sign-in page
This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for
all user authentication.
2015-05-29 18:15:03 +02:00
Dmitriy Zaporozhets a3b60982e5 Merge branch 'leave-project' into 'master'
Add ability to leave project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !744
2015-05-29 15:10:46 +00:00
Dmitriy Zaporozhets ab2e67550b Merge branch 'user-oauth-applications' into 'master'
Add option to disallow users from registering any application to use GitLab as an OAuth provider

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264.

![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png)

See merge request !742
2015-05-29 14:51:33 +00:00
Dmitriy Zaporozhets 2afa5fcb52 Add ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 16:23:36 +02:00
Dmitriy Zaporozhets 394fe7614c Merge branch 'leave-group' into 'master'
User should be able to leave group. If not - show him proper message

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !743
2015-05-29 13:35:05 +00:00
Dmitriy Zaporozhets cef746dc94 User should be able to leave group. If not - show him proper message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29 14:12:30 +02:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Douwe Maan 70b29c3576 Merge branch 'feature/saml_support' into 'master'
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
2015-05-29 10:37:27 +00:00
Robert Speicher f46b367068 Add MergeRequests#commits action and route
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
2015-05-29 00:09:28 -04:00
Dmitriy Zaporozhets 2db026793d Fix current user removal
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 12:53:04 +02:00
Dmitriy Zaporozhets 499154518a You can not remove user if he/she is an only owner of group
To prevent loose of group data you need to transfer or remove group
first before you can remove user

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 12:00:02 +02:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02:00
Douwe Maan 45e4727f97 Set milestone on new issue when creating issue from index with milestone filter active. 2015-05-27 14:22:11 +02:00
Dmitriy Zaporozhets 3ed05b2191 Merge branch 'rs-manual-2fa-entry' into 'master'
Add support for manually entering 2FA details

> ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png)

Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone.

See merge request !694
2015-05-27 09:53:40 +00:00
Robert Speicher 7b879bb8bd Bump secret key length to 32 2015-05-23 18:47:53 -04:00
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04:00
Stan Hu deeff56967 Add support for Webhook note events
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-21 23:48:16 -04:00
Dmitriy Zaporozhets f5f0ed55bd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-18 17:58:22 +03:00
Nikita Verkhovin 241f5971ba Add search issues/MR by number 2015-05-18 13:09:13 +06:00
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada c68c23210b Redirect if password reset token is expired
Don't display the password editing form if the user's token is expired;
redirect to the form that allows users to request a new password reset
token.
2015-05-16 14:03:18 -06:00
Robert Speicher c802d8eee1 Refactor SessionsController to use a controller concern 2015-05-14 14:24:05 -04:00
Dmitriy Zaporozhets 8ad91d5840 Merge branch 'text-batch-1' into 'master'
Batch 1 of text improvements

Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.

This batch includes:

- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.

cc @rspeicher

See merge request !642
2015-05-13 12:05:17 +00:00
Dmitriy Zaporozhets f32a045ef4 Merge branch 'version-check' into 'master'
Version check

See merge request !1509
2015-05-13 11:17:16 +00:00
Douwe Maan 17a41547a0 Improve OAuth signup error message. 2015-05-13 09:41:56 +02:00