summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-241-0/+2
* Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-232-1/+51
|\
| * Fix admin identities codeDmitriy Zaporozhets2015-06-231-1/+1
| * Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| * Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-225-7/+10
| |\
| * | Refactor admin user pageDmitriy Zaporozhets2015-06-221-1/+10
| * | Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-4/+8
| * | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-4/+22
| * | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+21
* | | Fix error when deleting a user who has projectsStan Hu2015-06-232-2/+2
| |/ |/|
* | Merge branch 'remove_unused_except' into 'master'Dmitriy Zaporozhets2015-06-221-2/+2
|\ \
| * | projects doesn't seem to be a valid action in this controllerEaden2015-05-161-2/+2
* | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-221-1/+4
|\ \ \
| * | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-1/+4
* | | | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-193-4/+4
| |_|/ |/| |
* | | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-182-7/+2
|\ \ \ | |/ / |/| |
| * | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-182-7/+2
* | | 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')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
* | | 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
View Lorry Controller Status