Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-20Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets
Fix label color input. Because `value` was set, every label color would render as purple in the form. Introduced by 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef between 7.9 and 7.10, so no changelog item. See merge request !538
2015-04-15Fix merge request comments on files with multiple commitsDominik Sander
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
2015-04-15Merge branch 'invitation' into 'master'Dmitriy Zaporozhets
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
2015-04-15Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-04-15Merge branch 'google-code-import' into 'master'Douwe Maan
Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
2015-04-15Merge pull request #8905 from jasonblanchard/remove-truncation-milestoneDmitriy Zaporozhets
Remove truncation from issue titles on milestone page
2015-04-14Align project download button with others in sidebar on project home pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-14Fix button overflow for branches/tags pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-14Remove truncation from issue titles on milestone pageJason Blanchard
2015-04-14Let membership invitations be resent.Douwe Maan
2015-04-14Let members be invited from Add members pane.Douwe Maan
2015-04-14Correctly render invite members without user.Douwe Maan
2015-04-14Reference project members by id instead of user_id.Douwe Maan
2015-04-13Merge branch 'empty-avatar-alt-text' into 'master'Hannes Rosenögger
Explicitly set image alt to prevent graphical glitches Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de> See merge request !503
2015-04-13Explicitly set image alt to prevent graphical glitchesSven Strickroth
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-04-13Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets
Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
2015-04-13Fix performance issue when browse big diffsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-13Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets
Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
2015-04-09Move current user to the top of the list in author/assignee filtersStan Hu
Closes #1321
2015-04-08Merge branch 'project-file-tabs' into 'master'Dmitriy Zaporozhets
Move project file links to tab bar. The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load. ![Screen_Shot_2015-04-06_at_15.04.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/962e8073ab6dc8797f93ee754eb275ed/Screen_Shot_2015-04-06_at_15.04.21.png) See merge request !497
2015-04-08Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-04-07Merge branch 'rs-issue-2088' into 'master'Dmitriy Zaporozhets
Lower the pointHitDetectionRadius for commit charts Needed to update the Chart.js dependency as well. Fixes #2088 See merge request !1749
2015-04-07Lower the pointHitDetectionRadius for commit chartsRobert Speicher
Fixes #2088
2015-04-06Add icons to Add dropdown items.Douwe Maan
2015-04-06Move project file links to tab bar.Douwe Maan
2015-04-03Allow projects to be imported from Google Code.Douwe Maan
2015-04-03Clean up code.Douwe Maan
2015-04-03Allow admin to create public deploy keys that are accessible to any project.Douwe Maan
2015-04-02Only allow user to see participants from groups they have access to.Douwe Maan
2015-04-02Support configurable attachment size via Application SettingsStan Hu
Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
2015-04-01Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski
Conflicts: lib/gitlab/markdown.rb
2015-04-01Merge branch 'email-full-url'Marin Jankovski
2015-04-01Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets
Better looking milestone lists ### Before ![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png) ### After ![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png) See merge request !484
2015-04-01Better looking milestone listsDmitriy Zaporozhets
2015-03-31Merge branch 'file-commit-list' into 'master'Douwe Maan
Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
2015-03-31Merge branch 'commits-count-badge' into 'master'Dmitriy Zaporozhets
Added badge to commits tab Fixes #1261 See merge request !465
2015-03-31Added badge to commits tabPhil Hughes
2015-03-30Fixed issue where only 25 commits would load in file listingsPhil Hughes
2015-03-30Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets
2015-03-30Refactor star/fork buttonsDmitriy Zaporozhets
2015-03-30Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into ↵Dmitriy Zaporozhets
Soullivaneuh-file-type
2015-03-29Merge branch 'repo-buttons' into 'master'Dmitriy Zaporozhets
Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473
2015-03-29Alignment fixes for repo buttonsPhil Hughes
2015-03-29Moved download button into sidebarPhil Hughes
Star and fork buttons moved up
2015-03-29Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-03-29Merge branch 'fix-plain-diffs' into 'master'Dmitriy Zaporozhets
Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737
2015-03-28Improve file icons rendering on treeSullivan SENECHAL
2015-03-28Merge pull request #9043 from skburgart/fix/merge-wordingRobert Schilling
Change merging notification to sound more natural
2015-03-28Small css improvements to selectboxes and issue filterDmitriy Zaporozhets
2015-03-27Change merging notification to sound more naturalSteven Burgart