summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-271-0/+1
|\
| * Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-0/+1
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-271-1/+3
|\ \
| * \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-271-0/+1
| |\ \ | | | | | | | | Add X-GitLab-Event header for web hooks
| | * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-0/+1
| | | |
| * | | Add notify and color options to HipchatServiceDominik Sander2015-04-261-0/+1
| |/ / | | | | | | | | | | | | | | | When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.
| * | Merge pull request #9189 from rockneverdies55/patch-1Robert Schilling2015-04-251-1/+1
| |\ \ | | |/ | |/| Removed "unreleased" from v7.10 changelog
| | * Removed "unreleased" from v7.10 changelogrockneverdies552015-04-241-1/+1
| | | | | | | | | Version 7.10 is already released so "unreleased" text next to it in the changelog file can be removed.
* | | Add new admin settingsVinnie Okada2015-04-261-1/+1
|/ / | | | | | | | | Add new global application settings for default project and snippet visibility levels.
* | Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-241-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Fix bug where Slack service channel was not saved in admin template settings Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 Closes #1501 See merge request !574
| * Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-241-1/+1
| | | | | | | | | | | | Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-241-0/+1
|\ \
| * | Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-241-0/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move changelog item tot 7.11.Douwe Maan2015-04-241-1/+1
| |
* | Revert "Revert disallowing usernames to end in period."Douwe Maan2015-04-241-0/+1
|/ | | | This reverts commit c75c6b840ba9ed82bb01eca52e968c2b0ec985e6.
* Update changelog.Douwe Maan2015-04-241-0/+2
|
* Update changelog.Douwe Maan2015-04-231-0/+2
|
* Add CHANGELOG item for new sidebarDmitriy Zaporozhets2015-04-231-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'sign-out-to-sign-in' into 'master'Dmitriy Zaporozhets2015-04-231-0/+1
|\ | | | | | | | | | | | | | | Redirect to sign in page after signing out. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125. See merge request !541
| * Move changelog item to 7.11.sign-out-to-sign-inDouwe Maan2015-04-181-1/+1
| |
| * Redirect to sign in page after signing out.Douwe Maan2015-04-181-0/+1
| |
* | Merge branch 'issue-body-code-mentions' into 'master'Dmitriy Zaporozhets2015-04-231-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
| * | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentionsDouwe Maan2015-04-211-1/+2
| | | | | | | | | | | | a user mention.
* | | Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775
| * | | Add changelog entry [ci skip]Robert Speicher2015-04-181-1/+1
| | | |
* | | | do not send empty message to hipchatChulki Lee2015-04-221-0/+1
| | | |
* | | | Merge branch 'fix-duplicate-changelog-entry' into 'master'Hannes Rosenögger2015-04-211-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove entry that was shipped in v7.9.1 See merge request !532
| * | | | Remove entry that was shipped in v7.9.1Stan Hu2015-04-161-1/+0
| | | | |
* | | | | Merge branch 'fix-cannot-move-project-error' into 'master'Douwe Maan2015-04-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Cannot move project" error message from popping up after a successful transfer The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project". ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png) I attempted to write a unit test for this, but it was taking me too long to get it right. Closes #1448 and #1128 See merge request !548
| * | | | Fix "Cannot move project" error message from popping up after a successful ↵Stan Hu2015-04-201-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | project transfer Multiple event handlers were firing, causing multiple form submissions. Closes #1448 and #1128
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-201-1/+0
|\ \ \ \
| * | | | Revert disallowing usernames to end in period.revert-username-periodDouwe Maan2015-04-201-1/+0
| | | | |
* | | | | improve new project optionsBen Bodenmiller2015-04-201-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Tweak changelog item.Douwe Maan2015-04-171-1/+1
| | | | |
| * | | | add CHANGELOG entryHannes Rosenögger2015-04-161-0/+1
| | | | |
* | | | | Merge branch 'gitlab_git-7.1.10' into 'master'Dmitriy Zaporozhets2015-04-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-0/+1
| | |/ / / | |/| | | | | | | | | | | | | directories.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-201-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add Google Code importer to changelog.Douwe Maan2015-04-171-0/+1
| | |_|/ | |/| |
* | | | Fix Resource Owner Password Authentication FlowRoshan Gautam2015-04-171-1/+2
|/ / /
* | | Merge branch 'gitlab_git-7.1.9' into 'master'Dmitriy Zaporozhets2015-04-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_git to ignore invalid lines in .gitmodules. Pulls in gitlab_git 7.1.9 which contains https://gitlab.com/gitlab-org/gitlab_git/merge_requests/24 Closes #1412, https://github.com/gitlabhq/gitlabhq/issues/8135 and https://github.com/gitlabhq/gitlabhq/issues/8881 See merge request !535
| * | | Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9Douwe Maan2015-04-171-0/+1
| | | |
* | | | Merge branch 'repo-check-task' into 'master'Dmitriy Zaporozhets2015-04-171-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add new rake task to check repo integrity Add a `gitlab:repo:check` task that checks repository integrity with `git fsck`. See #1819. See merge request !1778
| * | | Add new rake taskVinnie Okada2015-04-151-0/+1
| |/ / | | | | | | | | | Add a task that checks repository integrity with `git fsck`.
* | | Merge pull request #8212 from dmedvinsky/fix-url-fieldMarin Jankovski2015-04-171-1/+1
|\ \ \ | | | | | | | | Fix auto-selection of URL field with X11 selection
| * | | Fix auto-selection of URL field with X11 selectionDmitry Medvinsky2015-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `focusin` event instead of `click` because when using the latter, when the selection is created it isn't put into X11 PRIMARY selection. And as a Linux user I'm very used to such behaviour that when something gets selected, it's ready for pasting, which is the primary purpose of the clone URL field. When `focusin` is used, the selection is copied to X11 buffer automatically, so it works as expected (tested in Firefox and Chrome).
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-171-0/+10
|\ \ \ \ | |/ / /
| * | | Added changelog for 7.11Jeroen van Baarsen2015-04-161-0/+10
| |/ / | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Add 7.9.4 to CHANGELOGupdate-changelogDmitriy Zaporozhets2015-04-161-0/+5
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>