summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Restore edit button in project readmeproject-readme-editDouwe Maan2015-10-222-6/+12
|
* Merge branch 'bozaro-empty-repo'Douwe Maan2015-10-222-1/+14
|\
| * Show empty repository page if repository don't have branchesArtem V. Navrotskiy2015-10-212-1/+14
| |
* | Merge branch 'dm-issue-3140' into 'master' Robert Speicher2015-10-222-28/+49
|\ \ | | | | | | | | | | | | | | | | | | Make sure MR refresh service correctly determines newly added commits. Fixes #3140. See merge request !1659
| * | Clean up MR refresh service somewhat.dm-issue-3140Douwe Maan2015-10-212-28/+48
| | |
| * | Make sure MR refresh service correctly determines newly added commits.Douwe Maan2015-10-211-1/+2
| |/
* | Merge branch 'fix-build-trace-updating' into 'master' Robert Speicher2015-10-222-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix build trace updating Fixes #2910 See merge request !1657
| * | Fix build trace updatingfix-build-trace-updatingKamil Trzcinski2015-10-212-2/+2
| |/
* | Merge branch 'fix-issue-3094' into 'master' Valery Sizov2015-10-221-41/+44
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Don't show "Add README" link in an empty repository if user doesn't have access to push Reporter users would see this before even though they didn't have access to push: ![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png) It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After: ![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png) Closes #3094 See merge request !1626
| * Don't show "Add README" link in an empty repository if user doesn't have ↵Stan Hu2015-10-211-41/+44
| | | | | | | | | | | | access to push Closes #3094
* | Merge branch 'markdown-tabs-margin' into 'master' Robert Speicher2015-10-211-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix margin around Markdown Write/Preview tabs. Reverts !1354 and uses another fix for #2585. See merge request !1654
| * | Fix margin around Markdown Write/Preview tabs.Douwe Maan2015-10-211-4/+1
| |/
* | Merge branch 'animated-logo' into 'master' Dmitriy Zaporozhets2015-10-214-9/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate the logo on hover The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition. Identical to how it looks on about.gitlab.com cc @skyruler See merge request !1557
| * | the logo svg should not mess with replacement imgsJob van der Voort2015-10-211-1/+6
| | |
| * | Animate the logo on hoverJob van der Voort2015-10-214-12/+41
| | | | | | | | | | | | | | | | | | The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition.
* | | Merge branch 'full-width-tables' into 'master' Dmitriy Zaporozhets2015-10-2141-677/+708
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tables full width. ## Before ![Screen_Shot_2015-10-19_at_11.17.32](/uploads/acea66825b41006a949b5cc31cc07699/Screen_Shot_2015-10-19_at_11.17.32.png) ## After ![Screen_Shot_2015-10-19_at_11.19.16](/uploads/ed61e5e6cafe06c5e2d75672f5585c93/Screen_Shot_2015-10-19_at_11.19.16.png) See merge request !1642
| * | Fix duplication between tree_header and tree_contentDouwe Maan2015-10-211-31/+0
| | |
| * | Merge branch 'master' into full-width-tablesDouwe Maan2015-10-2148-191/+401
| |\ \ | | |/
| * | Merge branch 'master' into full-width-tablesfull-width-tablesDouwe Maan2015-10-1927-69/+152
| |\ \
| * | | Make tables full width.Douwe Maan2015-10-1941-678/+708
| | | |
* | | | Merge branch 'git-archive-improvements-2' into 'master' Douwe Maan2015-10-214-52/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Clear archive cache asynchronously See merge request !1651
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-improvements-2Jacob Vosmaer2015-10-2079-324/+672
| |\ \ \ | | | | | | | | | | | | | | | git-archive-improvements-2
| * | | | Remove unused sidekiq workerJacob Vosmaer2015-10-201-43/+0
| | | | |
| * | | | Clear archive cache asynchronouslyJacob Vosmaer2015-10-203-9/+18
| | | | |
* | | | | Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-209-19/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
| * | | | | Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-209-19/+38
| | | | | |
* | | | | | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-2016-28/+41
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* | | | | Fix duplicate repositories in GitHub import pageStan Hu2015-10-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
* | | | | Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-193-16/+22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1946-151/+342
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | [ci skip]
| * | | | | Sentences end in periods.Douwe Maan2015-10-181-2/+2
| | | | | |
| * | | | | Add tooltip.Douwe Maan2015-10-181-1/+1
| | | | | |
| * | | | | Find correct group membership.Douwe Maan2015-10-182-8/+6
| | | | | |
| * | | | | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-18193-1020/+1545
| |\ \ \ \ \
| * | | | | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-122-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications button was unavailable if user wasn't member of the project, even if protected project is available via group privileges. Showing disabled button with explanation tool-tip is less confusing. This closes #2846.
* | | | | | | Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into ↵Robert Speicher2015-10-197-0/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
| * \ \ \ \ \ \ Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1946-151/+342
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | [ci skip]
| * | | | | | | Add help text to admin settings notification email.Douwe Maan2015-10-181-0/+2
| | | | | | | |
| * | | | | | | Validate admin notification email.Douwe Maan2015-10-181-0/+4
| | | | | | | |
| * | | | | | | Only pass abuse report ID to AbuseReportMailer.Douwe Maan2015-10-182-6/+11
| | | | | | | |
| * | | | | | | Add HTML abuse report notification email.Douwe Maan2015-10-181-0/+11
| | | | | | | |
| * | | | | | | Tweak email body.Douwe Maan2015-10-181-3/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-18287-2399/+3009
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-085-0/+21
| | | | | | | |
* | | | | | | | Merge branch 'merge-request-widget' into 'master' Dmitriy Zaporozhets2015-10-191-37/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing commit status for widget when no CI service is enabled Fix for #3082 /cc @dzaporozhets See merge request !1621
| * | | | | | | | Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
| | | | | | | | |
* | | | | | | | | Merge branch 'index-milestone-title-label' into 'master' Robert Speicher2015-10-191-43/+71
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance when filtering on milestone on labels Also some minor refactoring in the seeding. See merge request !1587
| * | | | | | | | Rename confusing methodsDouwe Maan2015-10-191-4/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into zj/gitlab-ce-index-milestone-title-labelDouwe Maan2015-10-1832-118/+259
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Improve performance of filtering issues by milestoneDouwe Maan2015-10-161-30/+33
| | | | | | | | |
View Lorry Controller Status