summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets2015-04-201-0/+2
* Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-172-5/+22
* Fix username period migration to preserve uniqueness of names and paths.Douwe Maan2015-04-171-0/+1
* Fix merge request comments on files with multiple commitsDominik Sander2015-04-151-1/+5
* Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-16/+4
|\
| * Refactor key fingerprint generation.Douwe Maan2015-04-141-40/+4
| * The new fingerprint format wis incompatible with the previous regex.Sašo Stanovnik2015-03-241-4/+11
| * Use 2 spaces for indentation, not 4.Sašo Stanovnik2015-03-241-1/+1
| * Fixed generating SSH key fingerprints in OpenSSH 6.8.Sašo Stanovnik2015-03-241-1/+18
* | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-151-2/+2
|\ \
| * | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-141-2/+2
* | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-156-66/+222
|\ \ \
| * | | Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-141-0/+2
| * | | Follow newline guidelines.Douwe Maan2015-04-141-0/+1
| * | | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-143-39/+37
| * | | Let invites be declined.Douwe Maan2015-04-143-0/+26
| * | | Correctly import invited members.Douwe Maan2015-04-141-1/+1
| * | | Let members be invited from Add members pane.Douwe Maan2015-04-142-6/+36
| * | | Add emails around invitation.Douwe Maan2015-04-142-0/+24
| * | | Add invites controller.Douwe Maan2015-04-141-0/+7
| * | | Add invite logic to Member.Douwe Maan2015-04-143-38/+100
| * | | Track who created a group or project member.Douwe Maan2015-04-144-23/+29
| * | | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-141-6/+6
* | | | Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-151-1/+3
|\ \ \ \
| * | | | fix stuck mrBen Bodenmiller2015-04-141-1/+3
* | | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+9
* | | | | Allow user to choose which email to be publicSenorsen2015-04-141-0/+9
| |_|/ / |/| | |
* | | | Revert "Merge branch 'fix-stuck-mr' into 'master'"Douwe Maan2015-04-141-1/+1
* | | | fix stuck MRBen Bodenmiller2015-04-141-1/+1
| |/ / |/| |
* | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-131-0/+1
|\ \ \
| * | | fix ldap identitiesValery Sizov2015-04-111-0/+1
* | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-134-35/+30
|\ \ \ \
| * | | | Refactor ClosingIssueExtractor.Douwe Maan2015-04-032-3/+3
| * | | | Fix errors.Douwe Maan2015-04-021-1/+1
| * | | | Only allow users to cross-reference and close issues they have access to.Douwe Maan2015-04-023-8/+8
| * | | | Only allow user to see participants from groups they have access to.Douwe Maan2015-04-022-6/+6
| * | | | Add Commit#author and #committer.Douwe Maan2015-04-021-0/+8
| * | | | Slightly refactor getting note notification recipients.Douwe Maan2015-04-021-1/+1
| * | | | Refactor Mentionable mentioned users to use ReferenceExtractor.Douwe Maan2015-04-021-17/+6
| * | | | Slightly refactor ReferenceExtractor.Douwe Maan2015-04-021-5/+3
* | | | | Merge pull request #9104 from jdsn/fix-issue9098-clean_pathDmitriy Zaporozhets2015-04-131-2/+2
|\ \ \ \ \
| * | | | | clean_path should drop all leading dashes, not just oneJ. Daniel Schmidt2015-04-081-1/+1
| * | | | | clean_path should drop all trailing dots, not just oneJ. Daniel Schmidt2015-04-081-1/+1
| * | | | | clean_path should not drop the last characterJ. Daniel Schmidt2015-04-081-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-133-2/+30
|\ \ \ \ \
| * | | | | Clean up code.Douwe Maan2015-04-032-5/+14
| * | | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-033-2/+21
| |/ / / /
* | | | | Merge branch 'arbitrary-local-repo-import' into 'master'Dmitriy Zaporozhets2015-04-126-6/+6
|\ \ \ \ \
| * | | | | Don't use URI.regexp to validate since it doens't have start/end anchors.Douwe Maan2015-04-115-5/+5
View Lorry Controller Status