- 12 Mar, 2015 28 commits
-
-
Dmitriy Zaporozhets authored
Block user if he/she was blocked in Active Directory For gitlab/gitlab-ee#248 See merge request !1687
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Style improvements to import page See merge request !1685
-
Douwe Maan authored
Fix email images ## Dependencies: This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org ## What does this MR do? This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8. The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client. The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails. I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues. @DouweM can you review this please? Closes #1161 See merge request !373
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Fix missing GitHub organisation repositories on import page. Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this. cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9. See merge request !1683
-
Dmitriy Zaporozhets authored
Add blue theme to GitLab See merge request !1682
-
Dmitriy Zaporozhets authored
-
Marin Jankovski authored
-
Marin Jankovski authored
Emoji cheatsheet fix Worked through the help text for emoji to properly reference and use EmojiOne tags. Removed the ninja and reworked the first sentence a bit, as ninja isn't supported by EmojiOne. Should resolve ticket #953. See merge request !384
-
Marin Jankovski authored
Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
-
Dmitriy Zaporozhets authored
Group controllers refactoring Usefulness of this refactoring is not so obvious on CE codebase. But It will allow us to remove huge amount of code on the EE side. See merge request !1684
-
Cameron Banga authored
-
Valery Sizov authored
-
Douwe Maan authored
-
Hannes Rosenögger authored
This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced
-
Dmitriy Zaporozhets authored
-
Marin Jankovski authored
-
Dmitriy Zaporozhets authored
Allow smb:// links in Markdown text. As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184 See merge request !1669
-
Dmitriy Zaporozhets authored
Update html-pipeline and emoji See merge request !1680
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Conflicts: Gemfile.lock
-
Sytse Sijbrandij authored
add AMI update step See merge request !1677
-
Dmitriy Zaporozhets authored
Remove annoying notice messages when create/update merge request See merge request !1681
-
Dmitriy Zaporozhets authored
-
Marin Jankovski authored
-
Dmitriy Zaporozhets authored
Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues For gitlab/gitlab_git!24 See merge request !1679
-
- 11 Mar, 2015 12 commits
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Marin Jankovski authored
-
Marin Jankovski authored
Fix code preview theme setting for comments, issues, merge requests, and snippets User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme. Closes #1139 See merge request !357
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Escape wildcards when searching LDAP by username. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086. Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/omniauth-ldap/merge_requests/2. See merge request !1644
-
Dmitriy Zaporozhets authored
Remove placeholder methods to prevent calling methods rather than attributes. Since we have https://dev.gitlab.org/gitlab/gitlabhq/blob/7-8-stable/app/models/service.rb#L79 makes no sense to have methods as a placeholder. See merge request !1676
-
Dmitriy Zaporozhets authored
Dashboard restyle For #2069 See merge request !1675
-
Hannes Rosenögger authored
Generate valid json This patch helps to be compatible to other programing languages as it improves the validation of hook data. It seems only ruby can handle 'nil' as value while other json decode function will fatal. See merge request !182
-
Douwe Maan authored
-
Job van der Voort authored
-