summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
|
* Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-251-14/+12
|
* Remove CommitRange#to_aRobert Speicher2015-04-251-13/+0
|
* Include caret in CommitRange#reference_titleRobert Speicher2015-04-251-1/+1
|
* Remove param from CommitRange#to_sRobert Speicher2015-04-251-6/+2
|
* CommitRange improvementsRobert Speicher2015-04-251-14/+11
|
* Add CommitRange classRobert Speicher2015-04-251-0/+128
|
* Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-242-4/+4
| | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
* Explain namespace clearn regex.Douwe Maan2015-04-241-0/+5
|
* Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-241-1/+5
|
* Rename namespace_regex to namespace_path_regex.Douwe Maan2015-04-242-4/+4
|
* Explain purpose and usage.Douwe Maan2015-04-241-0/+24
|
* Fix behavior for Enumerable-like ActiveRecord relations.Douwe Maan2015-04-241-3/+1
|
* Fix small issues.Douwe Maan2015-04-241-4/+4
|
* Satisfy Rubocop.Douwe Maan2015-04-241-11/+12
|
* Fix errors.Douwe Maan2015-04-241-2/+2
|
* Select MR commit notes from source project.Douwe Maan2015-04-241-3/+6
|
* Move participants method to shared Participable concern.Douwe Maan2015-04-245-43/+51
|
* Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-242-36/+12
|
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-242-9/+9
|
* Use project.commit convenience method.Douwe Maan2015-04-243-4/+4
|
* Let commit model know about its project.Douwe Maan2015-04-245-13/+21
|
* Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-231-2/+2
|\ | | | | | | | | | | | | | | | | | | Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780
| * Note#cross_reference_exists? should be checking the noteable_type alsoRobert Speicher2015-04-161-2/+2
| |
* | Merge pull request #9042 from skburgart/fix/jira-linkMarin Jankovski2015-04-231-6/+5
|\ \ | | | | | | Fix broken link in jira service
| * | Fix broken link in jira serviceSteven Burgart2015-03-271-6/+5
| | |
* | | Merge branch 'issue-body-code-mentions' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
| * | | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentionsDouwe Maan2015-04-211-1/+1
| | | | | | | | | | | | | | | | a user mention.
* | | | do not send empty message to hipchatChulki Lee2015-04-221-2/+3
| | | |
* | | | Remove duplicate ampersand from Label title format validatorRobert Speicher2015-04-201-1/+1
|/ / /
* | | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-205-14/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528
| * | | Clean up code somewhat.better-commit-mentionsDouwe Maan2015-04-173-13/+9
| | | |
| * | | Fix Snippet#participants.Douwe Maan2015-04-153-0/+4
| | | |
| * | | Include snippet author in recipients of snippet note notification.Douwe Maan2015-04-151-0/+12
| | | |
| * | | Clean up code around commit mentions.Douwe Maan2015-04-153-10/+21
| | | |
* | | | Fix label color input.fix-label-color-inputDouwe Maan2015-04-171-0/+2
| | | |
* | | | Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-172-5/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease memory use and increase performance of Google Code importer. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241. See merge request !536
| * | | | Move import data out of project so it doesn't take ages to load.Douwe Maan2015-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
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab
* | Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-16/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix generating SSH key fingerprints with OpenSSH 6.8. Replaces https://github.com/gitlabhq/gitlabhq/pull/9008. Fixes gitlab-org/gitlab-ce#1289. cc @jacobvosmaer See merge request !519
| * | 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. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229. Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character. See merge request !521
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * | | | Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-141-0/+2
| | | | |
| * | | | Follow newline guidelines.Douwe Maan2015-04-141-0/+1
| | | | |