summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 7.10 requires gitlab-shell 2.6.2.upgrade-guide-gitlab-shellDouwe Maan2015-04-211-1/+1
|
* Merge pull request #9075 from Soullivaneuh/bootlintDmitriy Zaporozhets2015-04-202-0/+5
|\ | | | | Bootlint integration
| * Bootlint integrationSullivan SENECHAL2015-04-012-0/+5
| |
* | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-2010-41/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528
| * | Clean up code somewhat.better-commit-mentionsDouwe Maan2015-04-174-26/+24
| | |
| * | Fix notification service spec.Douwe Maan2015-04-151-1/+1
| | |
| * | Fix Snippet#participants.Douwe Maan2015-04-153-0/+4
| | |
| * | Only send note notifications to people accessible by the note author.Douwe Maan2015-04-151-2/+2
| | | | | | | | | | | | Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.
| * | Include snippet author in recipients of snippet note notification.Douwe Maan2015-04-151-0/+12
| | |
| * | Clean up code around commit mentions.Douwe Maan2015-04-158-25/+31
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-203-79/+2
|\ \ \
| * \ \ Merge branch 'revert-username-period' into 'master'Dmitriy Zaporozhets2015-04-203-79/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert disallowing usernames to end in period. cc @JobV @jacobvosmaer See merge request !545
| | * | | Revert disallowing usernames to end in period.revert-username-periodDouwe Maan2015-04-203-79/+2
| |/ / /
* | | | Merge pull request #9100 from bbodenmiller/patch-3Jeroen van Baarsen2015-04-202-6/+6
|\ \ \ \ | |/ / / |/| | | improve new project options
| * | | improve new project optionsBen Bodenmiller2015-04-202-6/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | * Simplify new repo commands * Include directions for how to add an existing folder that is either already a repo or not yet a repo Replaces #7918.
* | | Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-203-7/+252
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove access control for uploaded images to fix broken images in emails Replaces !530. > This MR removes the access control for uploaded images. This is needed to display the images in emails again. > > The previous solution to base64 encode the images had to be reverted, because not all email clients supported it. > > If possible this should go into the 7.10 release. See merge request !533
| * | | Explain skip_before_filter workaround.haynes/gitlab-ce-remove_access_control_for_imagesDouwe Maan2015-04-171-2/+5
| | | |
| * | | Tweak changelog item.Douwe Maan2015-04-171-1/+1
| | | |
| * | | Add tests.Douwe Maan2015-04-171-0/+223
| | | |
| * | | Correctly handle blocked users.Douwe Maan2015-04-171-15/+14
| | | |
| * | | add CHANGELOG entryHannes Rosenögger2015-04-161-0/+1
| | | |
| * | | remove access control for imagesHannes Rosenögger2015-04-161-6/+25
| | | | | | | | | | | | | | | | | | | | This commit removes the access control for uploaded images. This is needed to display the images in emails again.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-203-3/+4
|\ \ \ \
| * \ \ \ Merge branch 'gitlab_git-7.1.10' into 'master'Dmitriy Zaporozhets2015-04-203-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore submodules that are defined in .gitmodules but are checked in as directories. Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26. Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140 See merge request !540
| | * | | | Ignore submodules that are defined in .gitmodules but are checked in as ↵gitlab_git-7.1.10Douwe Maan2015-04-173-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | directories.
* | | | | | Merge pull request #9156 from hellerve/masterDmitriy Zaporozhets2015-04-201-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed typo in deploy html
| * | | | | | Fixed typo in deploy htmlhellerve2015-04-201-2/+2
| | | | | | |
* | | | | | | Merge pull request #9150 from digitalmediacenter/masterJeroen van Baarsen2015-04-201-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | do not prepend relative_url_root to avatar
| * | | | | | do not prepend relative_url_root to avatarLeo Antunes2015-04-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit.author.icon variable contains a full URL, which gets broken when prepended by the relative_url_root setting (generating hrefs like "/gitlabhttps://...".
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-202-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets2015-04-202-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Fix label color input.fix-label-color-inputDouwe Maan2015-04-172-1/+3
| | |/ / / /
* | | | | | Merge branch 'fix-label-color' into 'master'Dmitriy Zaporozhets2015-04-201-16/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse GFM references after sanitizing Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188. See merge request !1745
| * | | | | Fix GFM extractionsVinnie Okada2015-04-171-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Extract and re-insert links after sanitizing user markup.
| * | | | | Parse GFM references after sanitizingVinnie Okada2015-03-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-201-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'google-code-changelog' into 'master'Dmitriy Zaporozhets2015-04-171-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Google Code importer to changelog. cc @dzaporozhets See merge request !537
| | * | | | | Add Google Code importer to changelog.Douwe Maan2015-04-171-0/+1
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-202-3/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9083 from roshangautam/roshangautam-patch-1Douwe Maan2015-04-172-3/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix Resource Owner Password Authentication Flow
| | * | | | | Fix Resource Owner Password Authentication FlowRoshan Gautam2015-04-172-3/+4
| |/ / / / /
* | | | | | Merge branch 'rs-issue-2219' into 'master'Dmitriy Zaporozhets2015-04-192-11/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let Bootstrap's tab JS handle history Closes #2219 See merge request !1784
| * | | | | | Let Bootstrap's tab JS handle historyRobert Speicher2015-04-172-11/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes #2219
* | | | | | Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-198-63/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765
| * | | | | | Loosen help page parameter constraints for categoryRobert Speicher2015-04-153-3/+3
| | | | | | |
| * | | | | | Re-fix image rendering for help pagesRobert Speicher2015-04-154-8/+99
| | | | | | |
| * | | | | | Add constraints to help#show route parametersRobert Speicher2015-04-152-35/+20
| | | | | | |
| * | | | | | Add Markdown to Mime typesRobert Speicher2015-04-151-0/+2
| | | | | | |
| * | | | | | Revert "Fix and improve help rendering"Robert Speicher2015-04-157-47/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
* | | | | | | Merge branch 'add_section_on_SSH_documentation' into 'master'Patricio Cano2015-04-171-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the text "Add your ssh key to an application" with link to http://wiki.eclip… …se.org/EGit/User_Guide#Eclipse_SSH_Configuration Add text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration Add on document http://doc.gitlab.com/ce/ssh/README.html Reference: https://twitter.com/elraro21/status/585146770709151747 See merge request !1774
View Lorry Controller Status