summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'enhance_markdown_linebreak_docs' into 'master'Hannes Rosenögger2015-03-131-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance Markdown linebreak docs The "Line Breaks" section within the Markdown docs was missing an example of creating a line break within a paragraph by ending a line with two spaces. See merge request !335
| * | | | | | | | | Add an example of creating a line break by adding two spaces atEwan Edwards2015-02-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the end of a line.
* | | | | | | | | | Merge branch 'irker-service-use-supported-events' into 'master'Drew Blessing2015-03-131-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Irker service check supported_events 63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42 added the supported_events check for services. Since f84b7eef3f969a65d0930c9d62b6968b2ae70f12 was just added, we should adjust it accordingly. See merge request !367
| * | | | | | | | | | Make Irker service use the supported events checkStan Hu2015-03-041-2/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'mr-filter-by-title' into 'master'Dmitriy Zaporozhets2015-03-1311-35/+90
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement merge requests search It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues See merge request !1690
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-1234-64/+95
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/merge_requests_controller.rb
* | | | | | | | | | | | Merge branch 'default-pagination' into 'master'Dmitriy Zaporozhets2015-03-1219-27/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same constant for amount of items per page See merge request !1689
| * | | | | | | | | | | | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-1219-27/+29
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-1210-33/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent database query each time we render group avatar Fixes #2118 See merge request !1688
| * | | | | | | | | | | | Fix specsDmitriy Zaporozhets2015-03-122-18/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-128-15/+18
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-122-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show asterisks instead of password in service edit form. See merge request !1686
| * | | | | | | | | | | | Show asterisks instead of password in service edit form.Marin Jankovski2015-03-122-2/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ldap-block-user' into 'master'Dmitriy Zaporozhets2015-03-123-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block user if he/she was blocked in Active Directory For gitlab/gitlab-ee#248 See merge request !1687
| * | | | | | | | | | | | Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-123-2/+15
|/ / / / / / / / / / / /
| | * | | | | | | | | | Implement merge requests searchDmitriy Zaporozhets2015-03-1211-35/+90
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-126-6/+108
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-126-6/+108
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | replace images in emails with inline imagesHannes Rosenögger2015-03-126-6/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-126-9/+56
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style improvements to import page See merge request !1685
| * | | | | | | | | | | Style improvements to import pageDmitriy Zaporozhets2015-03-126-9/+56
| |/ / / / / / / / / /
* | | | | | | | | | | Add items into changelogDmitriy Zaporozhets2015-03-121-3/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-123-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-123-3/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'blue-theme' into 'master'Dmitriy Zaporozhets2015-03-124-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add blue theme to GitLab See merge request !1682
| * | | | | | | | | | | Add blue theme to GitLabDmitriy Zaporozhets2015-03-114-1/+18
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-122-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'emoji_cheatsheet_fix' into 'master'Marin Jankovski2015-03-122-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Updated help documentation to properly reference EmojiOne. [ci skip]Cameron Banga2015-03-122-10/+11
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'hover_toggle_sidebar'Marin Jankovski2015-03-121-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
| * | | | | | | | | | | | | Reverting pixel changeSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaks navbar
| * | | | | | | | | | | | | Fixed up app_logoSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pixel perfection.
| * | | | | | | | | | | | | Added hover stateSabba Petri2015-02-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also fixed it being one pixel off.
* | | | | | | | | | | | | | Merge branch 'refactoring_group_controllers' into 'master'Dmitriy Zaporozhets2015-03-123-14/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | group controller refactoringValery Sizov2015-03-123-14/+12
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Add deploy to ci.gitlab.com to release documents.Marin Jankovski2015-03-113-0/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'markdown-smb-link' into 'master'Dmitriy Zaporozhets2015-03-124-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Add changelog item.Douwe Maan2015-03-111-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Allow smb:// links in Markdown text.Douwe Maan2015-03-103-1/+11
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'new-emoji' into 'master'Dmitriy Zaporozhets2015-03-125-17/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update html-pipeline and emoji See merge request !1680
| * | | | | | | | | | | | Fix Gemfile.lockDmitriy Zaporozhets2015-03-111-5/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into new-emojiDmitriy Zaporozhets2015-03-116-9/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
* | | | | | | | | | | | | Merge branch 'ami-to-update-guides' into 'master'Sytse Sijbrandij2015-03-123-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add AMI update step See merge request !1677
| * | | | | | | | | | | | | Add a note about building AMI to security docMarin Jankovski2015-03-111-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | add AMI update stepJob van der Voort2015-03-112-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'reduce-notice-count' into 'master'Dmitriy Zaporozhets2015-03-121-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove annoying notice messages when create/update merge request See merge request !1681
| * | | | | | | | | | | | | | Remove annoying notice messages when create/update merge requestDmitriy Zaporozhets2015-03-111-6/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues For gitlab/gitlab_git!24 See merge request !1679
| * | | | | | | | | | | | | | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issuesDmitriy Zaporozhets2015-03-112-4/+4
|/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | Fix tests for emojioneDmitriy Zaporozhets2015-03-112-3/+5
| | | | | | | | | | | | | |