summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0410-72/+129
|\
| * 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 membersDouwe Maan2015-07-281-2/+3
| * | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-302-4/+9
| |\ \
| | * | 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 attr...Douwe Maan2015-07-282-0/+15
| | |/
| * | Check that project was actually created rather than just validated in import:...Stan Hu2015-07-291-2/+2
| |/
| * 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
| * Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-241-0/+4
| |\
| | * 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 access to disabled features for unauthenticated usersDaniel Gerhardt2015-07-201-23/+31
| | |/
| * | Remove repository graph log to fix slow cache updates after push eventStan Hu2015-07-191-19/+1
| * | Fix label read access for unauthenticated usersDaniel Gerhardt2015-07-191-0/+1
| |/
| * 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.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 resulteven-faster-searchDmitriy Zaporozhets2015-07-131-6/+5
| * | | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-172-12/+4
| * | | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-171-2/+21
| | |/ | |/|
* | | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ...Dmitriy Zaporozhets2015-07-161-5/+4
* | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-162-13/+16
* | | 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 'rs-issue-1773' into 'master'Dmitriy Zaporozhets2015-07-142-15/+29
|\ \
| * | 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
* | | Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-131-0/+4
|/ /
* | Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets2015-07-131-0/+1
|\ \
| * | 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!rs-disable-2faRobert Speicher2015-07-101-0/+10
| |/
* | Add tests for repository search filesDmitriy Zaporozhets2015-07-121-1/+1
* | Fix search blobs for wikiDmitriy Zaporozhets2015-07-121-1/+1
* | Implement search of code via git grepsearch-git-grepDmitriy Zaporozhets2015-07-101-0/+34
|/
* Merge branch 'rs-dev-issue-2372' into 'master'Dmitriy Zaporozhets2015-07-081-0/+4
|\
| * Rename NoMilestone to Milestone::NoneRobert Speicher2015-07-062-13/+4
| * Allow user to filter by Issues/Merge Requests without a MilestoneRobert Speicher2015-07-061-0/+13
* | Change "Irc Uri" -> "IRC URI"Stan Hu2015-07-071-1/+1
|/
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-062-0/+21
|\
| * Audit log for user authenticationValery Sizov2015-07-062-0/+21
View Lorry Controller Status