summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8030 from cirosantilli/factor-authorizeDmitriy Zaporozhets2014-10-2115-18/+18
|\ | | | | Factor authorize_push! and authorize_code_access!
| * Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-1315-18/+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-213-11/+11
|\ \ | | | | | | Use @project on controllers, don't call method
| * | Use @project on controllers, don't call methodCiro Santilli2014-10-193-11/+11
| |/ | | | | | | | | Also memoize the method to ensure that other methods in ApplicationController that rely on it can call it efficiently.
* | Use :message key, not :error for File::Service.Ciro Santilli2014-10-132-2/+2
|/
* Snippets: public/internal/privateValery Sizov2014-10-091-2/+5
|
* Remove outdated comment from commits_controllerCiro Santilli2014-10-071-1/+1
|
* 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
| |
* | 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.
* Add Pushover service integrationSullivan SENECHAL2014-10-031-1/+2
| | | | That introduce select field type for services options.
* 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
| |
* | Show test coverage results in MR if availableDmitriy Zaporozhets2014-10-021-2/+11
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove statement without effect.Ciro Santilli2014-09-301-1/+0
|
* Faster branch contains detection for commitDmitriy Zaporozhets2014-09-291-7/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor commits graphDmitriy Zaporozhets2014-09-291-27/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Raw implementation of commits stats pageDmitriy Zaporozhets2014-09-261-0/+31
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rewrite graphs featureDmitriy Zaporozhets2014-09-262-10/+12
| | | | | | | | * remove commits stats page (will be replaced by graphs) * remove additions/deletions from graph because of bad performance * keep graph logic in gitlab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont show blocked users in assignee filterDmitriy Zaporozhets2014-09-251-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'use-more-rugged' into 'master'Dmitriy Zaporozhets2014-09-252-8/+2
|\ | | | | | | | | | | | | | | | | | | Make GitLab CE works with new gitlab_git Recently we removed grit dependency from `gitlab_git` in favor of rugged. This changes make GitLab works with new library. See merge request !194
| * Fix Commit stats and diff encoding issuesDmitriy Zaporozhets2014-09-252-8/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix non-showing error message when edit file via webDmitriy Zaporozhets2014-09-241-1/+1
|/
* Merge pull request #7807 from cirosantilli/factor-service-errorDmitriy Zaporozhets2014-09-223-9/+7
|\ | | | | Factor error and success methods from services.
| * Factor error and success methods from services.Ciro Santilli2014-09-213-9/+7
| |
* | Fix STI+polymorphic for Group <-> GroupMemberDmitriy Zaporozhets2014-09-141-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-141-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-141-7/+7
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* update tags count if tag gets deletedRobert Schilling2014-09-121-1/+1
|
* Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use new diff parsing logicDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7658 from Razer6/refresh_labels_page_on_deleteDmitriy Zaporozhets2014-09-051-1/+1
|\ | | | | Show labels help message if last label is deleted
| * Show labels help message if last label is deletedRobert Schilling2014-09-041-1/+1
| |
* | Added annotated tags. Updated tag haml file and call to gitlab-shell. ↵Sean Edge2014-09-041-1/+2
| | | | | | | | Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.
* | Validate tag-names and references in WebUI, APIRobert Schilling2014-09-031-4/+9
| |
* | Validate branch-names and references in WebUI, APIRobert Schilling2014-09-031-3/+11
|/ | | | Add specs for GitRefValidator
* Dont allow edit or remove of system notesDmitriy Zaporozhets2014-08-291-4/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Prevent possible XSS issues by seting text/plain for all text files inDmitriy Zaporozhets2014-08-281-4/+2
| | | | | | RAW feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Search by issue/mr title and descriptionDmitriy Zaporozhets2014-08-271-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Set charset encoding to UTF-8 for snippetsJeroen van Baarsen2014-08-161-1/+1
| | | | | | Fixes #2678 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* diff unfoldskv2014-08-141-0/+15
|
* Merge branch 'remove-remove-label' into 'master'Dmitriy Zaporozhets2014-08-131-1/+4
|\ | | | | | | | | | | Remove labels via ajax See merge request !1019
| * Remove labels with ajax requestDmitriy Zaporozhets2014-08-131-1/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix repository archiveDmitriy Zaporozhets2014-08-131-5/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7393 from Razer6/fix_500_hook_service_downDmitriy Zaporozhets2014-08-111-2/+7
|\ | | | | Prevent 500 if hook url is down when testing a hook, fixes #7376
| * Prevent 500 if hook url is down, fixes #7376Robert Schilling2014-07-291-2/+7
| |
* | Order labels by nameDmitriy Zaporozhets2014-07-301-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve labelsDmitriy Zaporozhets2014-07-301-4/+9
| | | | | | | | | | | | | | * allow developers to manage labels * add ability to remove label Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add create/update to Labels controllerDmitriy Zaporozhets2014-07-301-1/+40
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status