summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8091 from cirosantilli/factor-ability-abilitiesDmitriy Zaporozhets2014-10-283-10/+3
|\ | | | | Factor abilities methods
| * Factor abilities methodsCiro Santilli2014-10-193-10/+3
| | | | | | | | in app controller, user model and services.
* | Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-271-1/+1
|\ \ | | | | | | Use Gitlab.config instead of Settings everywhere
| * | Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-151-1/+1
| | |
* | | Fix raw view for public snippetsValery Sizov2014-10-271-1/+1
| | |
* | | fix for public snippetValery Sizov2014-10-241-1/+1
| | |
* | | Merge pull request #8093 from ↵Dmitriy Zaporozhets2014-10-211-4/+0
|\ \ \ | | | | | | | | | | | | | | | | cirosantilli/rm-duplicate-derived-admin-repository-method Remove unused admin/projects#repository method
| * | | Remove unused admin/projects#repository methodCiro Santilli2014-10-211-4/+0
| | | | | | | | | | | | | | | | Already defined on the ApplicationController base class.
* | | | Merge pull request #8029 from cirosantilli/rm-projects-controller-filterDmitriy Zaporozhets2014-10-211-1/+0
|\ \ \ \ | | | | | | | | | | Remove unused filter from ProjectsController
| * | | | Remove unused filter from ProjectsControllerCiro Santilli2014-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | Neither controller nor any of it's descendants have those actions.
* | | | | Merge pull request #8028 from cirosantilli/rm-dev-toolsDmitriy Zaporozhets2014-10-211-4/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Remove unused dev_tools helper.
| * | | | Remove unused dev_tools helper.Ciro Santilli2014-10-131-4/+0
| |/ / /
* | | | Merge pull request #8030 from cirosantilli/factor-authorizeDmitriy Zaporozhets2014-10-2116-26/+18
|\ \ \ \ | | | | | | | | | | Factor authorize_push! and authorize_code_access!
| * | | | Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-1316-26/+18
| |/ / / | | | | | | | | | | | | | | | | with existing method_missing. Pattern already used extensively, so let's be consistent and use it everywhere.
* | | | Merge pull request #8102 from cirosantilli/use-memoized-projectDmitriy Zaporozhets2014-10-216-38/+41
|\ \ \ \ | | | | | | | | | | Use @project on controllers, don't call method
| * | | | Use @project on controllers, don't call methodCiro Santilli2014-10-196-38/+41
| | |_|/ | |/| | | | | | | | | | | | | | Also memoize the method to ensure that other methods in ApplicationController that rely on it can call it efficiently.
* | | | Merge pull request #8101 from ↵Dmitriy Zaporozhets2014-10-211-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cirosantilli/rm-project-id-admin-project-controller Remove param[:project_id] at admin controller
| * | | | Remove param[:project_id] at admin controllerCiro Santilli2014-10-191-3/+1
| |/ / / | | | | | | | | | | | | The route never passes that parameter to the helpers.
* | | | Merge branch 'fix-group-member-remove' into 'master'Dmitriy Zaporozhets2014-10-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group member remove Fixes https://github.com/gitlabhq/gitlabhq/issues/8090. See merge request !1196
| * | | | Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-201-0/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7856 from cirosantilli/error-to-msgDmitriy Zaporozhets2014-10-202-2/+2
|\ \ \ \ | |/ / / |/| | | Fix missing flash on file edit error from web UI.
| * | | Use :message key, not :error for File::Service.Ciro Santilli2014-10-132-2/+2
| |/ /
* | | Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-8/+5
| | | | | | | | | | | | | | | | | | | | | verification for #1677 Since testing omniauth_callback_controller.rb is very difficult, the logic is moved to the models
* | | Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
| |/ |/| | | | | | | | | | | Because devise will trigger a save, allowing unsaved users to login, behaviour had changed. The current implementation returns a pre-build user, which can be saved without errors. Reported in #1677
* | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-141-1/+1
| |
* | Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-4/+0
| |
* | Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-131-0/+1
|\ \ | |/ | | | | | | Conflicts: app/controllers/omniauth_callbacks_controller.rb
| * Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-131-0/+1
| |\ | | | | | | | | | | | | | | | Sorting users in admin See merge request !1170
| | * Admin: user sortingValery Sizov2014-10-131-0/+1
| | |
| * | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-101-20/+15
| |/
* | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-132-20/+23
|/ | | | These changes are ported from EE to CE. Apply changes for app directory
* Snippets: public/internal/privateValery Sizov2014-10-092-22/+27
|
* Merge pull request #7985 from cirosantilli/outdated-commentRobert Schilling2014-10-071-1/+1
|\ | | | | Remove outdated comment from commits_controller
| * Remove outdated comment from commits_controllerCiro Santilli2014-10-071-1/+1
| |
* | Snippets: rename public to internalValery Sizov2014-10-071-4/+4
|/
* Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-061-1/+1
|\ | | | | | | | | | | Slack integration See merge request !1151
| * Add missing comma.Marin Jankovski2014-10-061-1/+1
| |
| * Use only webhook for slack service integration.Marin Jankovski2014-10-061-1/+1
| |
* | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-062-2/+2
|\ \ | | | | | | Add task lists to issues and merge requests
| * | Add task lists to issues and merge requestsVinnie Okada2014-10-052-2/+2
| |/ | | | | | | | | | | | | | | Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists.
* | Protect from forgery with exceptionDmitriy Zaporozhets2014-10-061-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add Pushover service integrationSullivan SENECHAL2014-10-031-1/+2
| | | | That introduce select field type for services options.
* Merge branch 'cirosantilli-factor-commit-msg-textarea'Dmitriy Zaporozhets2014-10-031-1/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/edit_tree/show.html.haml
| * Merge branch 'factor-commit-msg-textarea' of ↵Dmitriy Zaporozhets2014-10-031-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/blob/_remove.html.haml
| | * Factor commit message textareas.Ciro Santilli2014-10-021-1/+1
| | |
* | | Merge branch 'signin_after_confirmation' into 'master'Dmitriy Zaporozhets2014-10-031-0/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Signin after confirmation Fixes #1471 See merge request !1146
| * | Try signing in the user after user confirmation is correct and redirect to ↵Marin Jankovski2014-10-021-0/+17
| |/ | | | | | | dashboard, otherwise redirect to signin page
* | Add parenthesis to function def with arguments.Ciro Santilli2014-10-032-3/+3
| |
* | Show test coverage results in MR if availableDmitriy Zaporozhets2014-10-021-2/+11
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status