summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-2/+15
* 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
* Add `dashboard` attribute to User modelRobert Speicher2015-06-131-0/+1
* Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
* 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
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+1
* | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-121-12/+4
|\ \
| * | Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-12/+1
| * | Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
| * | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-111-4/+0
| * | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-111-1/+9
* | | Merge pull request #9371 from zenati/patch-2Dmitriy Zaporozhets2015-06-111-1/+1
|\ \ \ | |/ / |/| |
| * | 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.Nicolas2015-06-091-2/+0
| |/ /
* | | Merge branch 'ldap-remember-me' into 'master'Dmitriy Zaporozhets2015-06-091-1/+1
|\ \ \ | |/ / |/| |
| * | 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 editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-30/+30
| |/
* | 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
|\
| * Move repository when project is removedDmitriy Zaporozhets2015-06-031-10/+7
* | Wrap group removal into serviceDmitriy Zaporozhets2015-06-032-2/+2
|/
* Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-021-0/+16
|\
| * Add an option to automatically sign-in with an Omniauth provider without show...Alex Lossent2015-05-291-0/+16
* | 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 projectDmitriy Zaporozhets2015-05-291-1/+5
* | 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 a...user-oauth-applicationsDouwe Maan2015-05-292-0/+9
| |/
* | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ \ | |/ |/|
| * User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-291-1/+5
* | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+3
|\ \ | |/ |/|
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+3
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-5/+12
* | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
* | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-282-6/+2
* | Set milestone on new issue when creating issue from index with milestone filt...Douwe Maan2015-05-271-4/+4
|/
* Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-271-1/+2
|\
| * 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
* | Add support for Webhook note eventsStan Hu2015-05-211-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-182-2/+18
|\
| * Add search issues/MR by numberNikita Verkhovin2015-05-182-2/+18
View Lorry Controller Status