summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix 403 Access Denied error messages when accessing Labels section in a ↵Stan Hu2015-06-182-7/+2
| | | | | | | | | | | | | | | | | | project that has MRs disabled but issues enabled Closes #1813
* | | Merge branch 'rs-dev-issue-2373' into 'master'Dmitriy Zaporozhets2015-06-171-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') https://dev.gitlab.org/gitlab/gitlabhq/issues/2373 See merge request !821
| * | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
| | |
* | | Support commenting on a diff in side-by-side viewStan Hu2015-06-161-2/+15
|/ / | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* | Refactor RootControllerRobert Speicher2015-06-131-2/+12
| |
* | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-4/+9
| |
* | Add RootControllerRobert Speicher2015-06-131-0/+18
| | | | | | | | | | | | 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.
* | Add `dashboard` attribute to User modelRobert Speicher2015-06-131-0/+1
| |
* | Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
| | | | | | | | | | It was only used for the appearance live updating, which is now handled by Profiles::Preferences#update
* | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-132-8/+19
| |
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+29
| |
* | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| | | | | | | | | | | | | | | delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
| * | Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+1
| | | | | | | | | settings
* | | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-121-12/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-12/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-111-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-111-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #9371 from zenati/patch-2Dmitriy Zaporozhets2015-06-111-1/+1
|\ \ \ \ | |/ / / |/| | | An `in_namespace` scope is already present
| * | | An `in_namespace` scope is already presentzenati2015-06-091-1/+1
| | | |
* | | | Merge branch 'move_project_members_link' into 'master'Dmitriy Zaporozhets2015-06-091-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Project Members link from Settings to main menu. Addresses #2278. See merge request !1846
| * | | | Move Project Members link from Settings to main menu.Nicolas2015-06-091-2/+0
| |/ / / | | | | | | | | | | | | Addresses #2278.
* | | | Merge branch 'ldap-remember-me' into 'master'Dmitriy Zaporozhets2015-06-091-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add "Remember me" checkbox to LDAP signin form. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2127. See merge request !772
| * | | Add "Remember me" checkbox to LDAP signin form.ldap-remember-meDouwe Maan2015-06-051-1/+1
| |/ /
* | | Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets2015-06-051-30/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-30/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-051-1/+11
|/ /
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-032-10/+1
| |
* | Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-031-10/+7
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * | Move repository when project is removedDmitriy Zaporozhets2015-06-031-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Wrap group removal into serviceDmitriy Zaporozhets2015-06-032-2/+2
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-021-0/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-291-0/+16
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Allow to configure a URL to show after sign outAlex Lossent2015-05-292-1/+2
|/ /
* | Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
| * | Add ability to leave projectDmitriy Zaporozhets2015-05-291-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'user-oauth-applications' into 'master'Dmitriy Zaporozhets2015-05-292-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-292-0/+9
| |/ / | | | | | | | | | as an OAuth provider
* | | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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
| * | User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-291-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Add SAML support via Omniauth Split of !669, with doc See merge request !722
| * | Add SAML support via OmniauthAlex Lossent2015-05-271-0/+3
| | |
* | | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-5/+12
| | | | | | | | | | | | /:namespace_id/:project_id/merge_requests/:id/commits(.:format)
* | | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-282-6/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Set milestone on new issue when creating issue from index with milestone ↵Douwe Maan2015-05-271-4/+4
|/ / | | | | | | filter active.
* | Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-271-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-231-1/+1
| | |
| * | Add support for manually entering 2FA detailsRobert Speicher2015-05-231-1/+2
| | |