summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9Douwe Maan2015-04-173-3/+4
|
* Merge pull request #8212 from dmedvinsky/fix-url-fieldMarin Jankovski2015-04-173-4/+4
|\ | | | | Fix auto-selection of URL field with X11 selection
| * Fix auto-selection of URL field with X11 selectionDmitry Medvinsky2015-04-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | We use `focusin` event instead of `click` because when using the latter, when the selection is created it isn't put into X11 PRIMARY selection. And as a Linux user I'm very used to such behaviour that when something gets selected, it's ready for pasting, which is the primary purpose of the clone URL field. When `focusin` is used, the selection is copied to X11 buffer automatically, so it works as expected (tested in Firefox and Chrome).
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-171-0/+10
|\ \ | |/
| * Merge pull request #9147 from jvanbaarsen/changelof-7-11Dmitriy Zaporozhets2015-04-161-0/+10
| |\ | | | | | | Added changelog for 7.11
| | * Added changelog for 7.11Jeroen van Baarsen2015-04-161-0/+10
| |/ | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'update-changelog' into 'master'Dmitriy Zaporozhets2015-04-161-0/+5
|\ \ | |/ |/| | | | | | | Add 7.9.4 to CHANGELOG See merge request !531
| * Add 7.9.4 to CHANGELOGupdate-changelogDmitriy Zaporozhets2015-04-161-0/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-164-7/+7
|\ \
| * \ Merge pull request #9131 from chulkilee/ruby-2.1.6Dmitriy Zaporozhets2015-04-163-6/+6
| |\ \ | | | | | | | | ruby 2.1.6
| | * | ruby 2.1.6Chulki Lee2015-04-133-6/+6
| | | | | | | | | | | | | | | | https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
| * | | Merge pull request #9094 from bbodenmiller/patch-1Jeroen van Baarsen2015-04-161-1/+1
| |\ \ \ | | |_|/ | |/| | update text to reference new location of setting
| | * | update text to reference new location of settingBen Bodenmiller2015-04-051-1/+1
| | | |
* | | | Merge branch 'update-install-guides-710' into 'master'Job van der Voort2015-04-162-13/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | update guides for 7.10 See merge request !1779
| * | | update guides for 7.10Job van der Voort2015-04-162-13/+13
|/ / /
* | | Merge pull request #9089 from dsander/fix-merge-request-commentsMarin Jankovski2015-04-155-7/+11
|\ \ \ | | | | | | | | Fix merge request comments on files with multiple commits
| * | | Fix merge request comments on files with multiple commitsDominik Sander2015-04-155-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-mention-notification' into 'master'Dmitriy Zaporozhets2015-04-151-24/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix Mention notification level. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2236. See merge request !527
| * | | Fix for snippets.fix-mention-notificationDouwe Maan2015-04-151-2/+4
| | | |
| * | | Fix Mention notification level.Douwe Maan2015-04-151-24/+13
| | | |
* | | | Merge branch 'fix-gitorious-test' into 'master'Marin Jankovski2015-04-157-37/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Make sure user has access to namespace in import tests. See merge request !529
| * | | Make sure user has access to namespace in import tests.Douwe Maan2015-04-157-37/+62
|/ / /
* | | No tabs in code!Dmitriy Zaporozhets2015-04-151-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1578-220/+1246
|\ \ \
| * \ \ Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-154-16/+74
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Simplify regex.sstanovnik-openssh_fixDouwe Maan2015-04-141-3/+3
| | | | |
| | * | | Refactor key fingerprint generation.Douwe Maan2015-04-143-40/+71
| | | | |
| | * | | Add changelog entry.Douwe Maan2015-04-141-0/+1
| | | | |
| | * | | 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-replyto' into 'master'Dmitriy Zaporozhets2015-04-154-12/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set EmailsOnPush reply-to address to committer email when enabled. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227. See merge request !520
| | * | | | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-144-12/+40
| | | | | |
| * | | | | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-153-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143-3/+4
| | | | | | |
| * | | | | | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-157-9/+84
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522
| | * | | | | | Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-142-1/+8
| | | | | | | |
| | * | | | | | Add config var to block auto-created LDAP users.Douwe Maan2015-04-146-9/+75
| | | | | | | |
| | * | | | | | Non-persisted users already have the identity by way of build_new_user.Douwe Maan2015-04-141-0/+2
| | |/ / / / /
| * | | | | | Merge branch 'fix-repository-rescue' into 'master'Dmitriy Zaporozhets2015-04-152-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash when project repository doesn't exist. See merge request !524
| | * | | | | | Don't crash when project repository doesn't exist.fix-repository-rescueDouwe Maan2015-04-142-1/+2
| | | | | | | |
| * | | | | | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-1564-179/+1042
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changelog item.Douwe Maan2015-04-151-0/+1
| | | | | | | | |
| | * | | | | | | Remove superfluous info from invite accepted/declined mails.invitationDouwe Maan2015-04-148-12/+8
| | | | | | | | |
| | * | | | | | | Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-144-1/+129
| | | | | | | | |
| | * | | | | | | Follow newline guidelines.Douwe Maan2015-04-147-7/+25
| | | | | | | | |
| | * | | | | | | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-145-43/+75
| | | | | | | | |
| | * | | | | | | Clear up InvitesController member lookup logic.Douwe Maan2015-04-141-5/+4
| | | | | | | | |
| | * | | | | | | Remove duplication from InvitesController.Douwe Maan2015-04-141-25/+22
| | | | | | | | |
| | * | | | | | | Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-147-20/+24
| | | | | | | | |