summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-062-1/+6
|\ | | | | | | | | | | | | | | | | | | Only publish ssh key-type and key Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys) To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded. See merge request !850
| * Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-042-1/+6
| |
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-056-54/+87
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0410-72/+129
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ↵Dmitriy Zaporozhets2015-07-161-5/+4
| | | | | | | | | | | | | | | | | | reload with full diff link Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-162-13/+16
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-153-12/+20
| | |
| * | Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
| | |
| * | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-153-11/+37
| | |
| * | Remove satellitesDmitriy Zaporozhets2015-07-153-19/+6
| | |
| * | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-151-0/+5
| | |
* | | Merge branch 'ci-skipped-status' into 'master' Kamil Trzciński2015-08-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for CI skipped status This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216 See merge request !1073
| * | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-041-1/+1
| | |/ | |/|
* | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-051-1/+1
|/ / | | | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
* | Re-annotate modelsAtsushi Ishida2015-08-035-3/+34
| |
* | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-311-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059
| * | Add specific ability for managing group membersDouwe Maan2015-07-281-2/+3
| | |
* | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-302-4/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
| * | | Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
| | | |
| * | | No more web urlDouwe Maan2015-07-303-12/+1
| | | |
| * | | Fix specsDouwe Maan2015-07-291-1/+1
| | | |
| * | | Use URL helpersDouwe Maan2015-07-293-4/+5
| | | |
| * | | Add project star and fork count, group avatar URL and user/group web URL ↵Douwe Maan2015-07-282-0/+15
| |/ / | | | | | | | | | attributes to API
* | | Check that project was actually created rather than just validated in ↵Stan Hu2015-07-291-2/+2
|/ / | | | | | | | | | | | | | | | | import:repos task Add gitlab-shell to error message to give user a clue that something may be wrong there. Ran into this in #2082. User was told that repositories were created when they were not due to hooks symlink being wrong.
* | Add Issuable#to_ability_nameRobert Speicher2015-07-241-0/+10
| |
* | Add admin_merge_request ability to Developer level and upRobert Speicher2015-07-241-1/+2
| | | | | | | | | | | | | | This was necessary because this permission is checked dynamically by `app/views/shared/issuable/_context` when on a Merge Request. Closes #2058
* | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-241-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Make username parameter for Users#show case-insensitive Closes #2012 See merge request !996
| * | Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-231-0/+4
| | |
* | | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-221-0/+4
| | |
* | | Merge branch 'fix-disabled-feature-access' into 'master'Stan Hu2015-07-201-23/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix (i.e. prevent) access to disabled features for unauthenticated users Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access. See merge request !1006
| * | | Fix access to disabled features for unauthenticated usersDaniel Gerhardt2015-07-201-23/+31
| |/ / | | | | | | | | | | | | | | | Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access.
* | | Remove repository graph log to fix slow cache updates after push eventStan Hu2015-07-191-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recalculating graph_log took minutes on a large repository since each of the 6000 commits would need to calculate the diff. Since graph_log does not appear to be used, remove it from the list of things to update. For the Linux kernel repository, this reduced the ProjectCacheWorker time from 8+ minutes to 16 seconds. Closes #2016
* | | Fix label read access for unauthenticated usersDaniel Gerhardt2015-07-191-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The label page was added to navigation for unauthorized users because the previously used milestone read permission was still checked. This has been fixed and read access to labels is now granted (again) for public projects. This regression has been introduced in 07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12). See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a. Refs !836, !842.
* | Merge branch 'validate_token_and_url_format_for_gitlab_ci' into 'master' Dmitriy Zaporozhets2015-07-171-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate format of project_url and token for GitLab CI service. If `project_url` and `token` for are invalid, [service_hook creation](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-13-stable/app/models/project_services/gitlab_ci_service.rb#L30-34) will silently fail due to validation of URL in `WebHook`. Given that token is a sequence of numbers and letters for GitLab CI making sure that there are no unexpected characters should be enough to prevent service_hook being nil. Fixes #1997 See merge request !987
| * | Validate format of project_url and token for GitLab CI service.Marin Jankovski2015-07-171-2/+6
| |/
* | Merge branch 'even-faster-search' into 'master' Dmitriy Zaporozhets2015-07-171-6/+5
|\ \ | | | | | | | | | | | | | | | | | | Avoid copy of strings in memory for parsing git grep result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !967
| * | Avoid copy of strings in memory for parsing git grep resulteven-faster-searchDmitriy Zaporozhets2015-07-131-6/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-172-12/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-171-2/+21
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rs-issue-1773' into 'master'Dmitriy Zaporozhets2015-07-142-15/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentions not being created upon issue/merge request update New cross-references weren't being added when they were made in an issue or merge request update. This happened because the relevant `UpdateService`s were making the `notice_added_references` call after the model had already been updated and saved, so the `changes` attribute was empty and no cross-references were made at all. This fixes the bug and adds a bit of testing and a bit of refactoring. Closes #1773 See merge request !974
| * | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-132-4/+4
| | |
| * | Refactor Mentionable#notice_added_referencesRobert Speicher2015-07-131-11/+25
| | | | | | | | | | | | | | | | | | | | | It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
* | | Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-131-0/+4
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets2015-07-131-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
| * | Add error message for SSH key linebreaksNikita Verkhovin2015-07-121-0/+1
| | |
* | | Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets2015-07-131-0/+10
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Add User#disable_two_factor! This method encapsulates all the logic for disabling 2FA on a specific User model. See merge request !961
| * | Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-0/+10
| |/ | | | | | | | | This method encapsulates all the logic for disabling 2FA on a specific User model.
* | Add tests for repository search filesDmitriy Zaporozhets2015-07-121-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix search blobs for wikiDmitriy Zaporozhets2015-07-121-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Implement search of code via git grepsearch-git-grepDmitriy Zaporozhets2015-07-101-0/+34
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status