16462 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douwe MaanandDouwe Maan	a3dcd67c83	Merge pull request #9316 from jvanbaarsen/gitlab-git-update ... Updated the gitlab_git gem	2015-05-21 11:34:31 +02:00
Douwe Maan	4ca7978b85	Merge branch 'rs-issue-1568' into 'master' ... Work around a Chrome 43 bug preventing note editing Fixes #1568 - and I mean "fixes" I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11. See merge request !684	2015-05-21 11:32:55 +02:00
Dmitriy ZaporozhetsandJob van der Voort	29aae2af57	Merge branch 'unauthorized-participants' into 'master' ... Don't send notifications to mentioned users that don't have access to the project in question. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325. See merge request !664	2015-05-21 10:46:41 +02:00
Robert SpeicherandJob van der Voort	0b63bb6e77	Customize the sanitization whitelist only once ... Fixes #1651	2015-05-21 10:42:51 +02:00
Douwe Maan	98f1286346	Merge branch 'lexer_error_workaround' into 'master' ... workaround for buggy lexers It seems that some lexers can be buggy when used together with git blame. This results in a 500 error when a user tries to open the blame page in some cases. The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails. This closes #1521 and #1646 /cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late. See merge request !683	2015-05-20 18:22:37 +02:00
Dmitriy ZaporozhetsandDouwe Maan	65c89b4208	Merge branch 'explain-wip-mr' into 'master' ... Add explanation about WIP status to MR form.   See merge request !666	2015-05-20 18:12:52 +02:00
Job van der Voort	a7a5de7fc2	Version 7.11.0.rc2 v7.11.0.rc2	2015-05-15 17:22:01 +02:00
Dmitriy Zaporozhets	4b686755b2	Merge branch 'attr_encryped_no_db_connection' into 'master' ... Don't require DB connection in AttrEncrypted. See merge request !667	2015-05-15 17:45:15 +03:00
Job van der Voort	f980dc4f60	Version 7.11.0.rc1 v7.11.0.rc1	2015-05-15 13:42:27 +02:00
Job van der Voort	940c4c101c	Merge branch '7-11-guides' into 'master' ... Update installation/update guides for 7.11. See merge request !665	2015-05-15 11:19:45 +00:00
Douwe Maan	fab9cbf98d	Update installation/update guides for 7.11.	2015-05-15 13:12:54 +02:00
Dmitriy Zaporozhets	be969bb4de	Merge branch 'fix-653' into 'master' ... Fix push event. Fixes issue with !653. See merge request !663	2015-05-15 10:12:33 +00:00
Douwe Maan	ac3d472ff4	Fix push event.	2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets	07fd736d2e	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets	9c6f4a2351	Merge branch 'dashboard-references' into 'master' ... Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653	2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets	de1aca131e	Merge branch 'spinner-spin' into 'master' ... Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655	2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets	3b4c0ea06f	Merge branch 'use-count-badges' into 'master' ... Use count badges with number_with_delimiter helper for issue, commit count See merge request !658	2015-05-15 09:56:56 +00:00
Jeroen van Baarsen	735fbb43ed	Merge pull request #9296 from jorgevbo/master ... Fix bug with default timezone en RSS gitlab events	2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets	a13e6f13c7	Fix gemfile.lock ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-15 08:57:20 +03:00
Dmitriy Zaporozhets	e54ff51aca	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-14 23:26:44 +03:00
Dmitriy Zaporozhets	740dc41250	Merge branch 'project_api_order' into 'master' ... Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656	2015-05-14 20:25:39 +00:00
Dmitriy Zaporozhets	aa4f085184	Merge branch 'rs-refactor-2fa' into 'master' ... Refactor SessionsController to use a controller concern See merge request !659	2015-05-14 20:23:30 +00:00
Jorge Vasquez	dfb58234a1	Fix bug with default timezone en RSS gitlab events	2015-05-14 15:30:55 -04:00
Robert Speicher	c802d8eee1	Refactor SessionsController to use a controller concern	2015-05-14 14:24:05 -04:00
Douwe Maan	37bc4bb199	Merge branch 'fix-blob-path' into 'master' ... Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651	2015-05-14 17:47:23 +00:00
Jeroen van Baarsen	e1982c3288	Merge pull request #9295 from afc163/master ... Add style for <kbd> element in markdown	2015-05-14 19:41:43 +02:00
afc163	2738978111	Add style for <kbd> element in markdown ... Fixes #5825	2015-05-14 23:57:01 +08:00
Dmitriy Zaporozhets	ded82ed4c9	Small refactoring of state_filters_text_for helper	2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets	40f381e652	append empty space only if count exists	2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets	3d4d89f060	Use count badges with number_with_delimiter helper for issue, commit count	2015-05-14 18:30:23 +03:00
Dmitriy Zaporozhets	8dde52cc09	Merge branch 'fewer-icons' into 'master' ... Use slightly fewer icons in project sidebar.  See merge request !657	2015-05-14 15:03:07 +00:00
Douwe Maan	191bb46d74	Use slightly fewer icons in project sidebar.	2015-05-14 17:02:00 +02:00
Dmitriy Zaporozhets	947231a461	Merge branch 'rs-relative-link-filter' into 'master' ... Minor RelativeLinkFilter cleanup See merge request !649	2015-05-14 14:37:43 +00:00
Dmitriy Zaporozhets	19251a1fc7	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-14 17:22:55 +03:00
Dmitriy Zaporozhets	c2ee828c19	Merge branch 'omniauth-csrf' into 'master' ... Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793	2015-05-14 14:22:26 +00:00
Dmitriy Zaporozhets	434180c7d2	Merge branch 'fix-group-mention' into 'master' ... Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654	2015-05-14 14:10:00 +00:00
Valery Sizov	7471047104	update API doc	2015-05-14 16:30:27 +03:00
Valery Sizov	7c3ca86370	Add order option for projects API	2015-05-14 15:49:09 +03:00
Dmitriy Zaporozhets	5619c7b968	Merge branch 'note-action-icons' into 'master' ... Always show note action icons. As discussed in #639. The delete icon becomes red on hover, the edit one becomes slightly darker. The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well.  See merge request !652	2015-05-14 12:43:39 +00:00
Douwe Maan	0b098060cc	Spin icon next to "Checking for CI status..."	2015-05-14 13:27:22 +02:00
Douwe Maan	e7eee3b720	Add changelog item.	2015-05-14 13:19:25 +02:00
Douwe Maan	77dc71d550	Fix mentioning of private groups.	2015-05-14 13:15:13 +02:00
Douwe Maan	cd52cef1c0	Fix reference links in dashboard activity and ATOM feeds.	2015-05-14 13:05:33 +02:00
Douwe Maan	74770137f6	Always show note action icons.	2015-05-14 12:18:19 +02:00
Sytse Sijbrandij	910794bae5	Merge branch 'upgrade-dockerfile-apt' into 'master' ... Use apt repositories to upgrade Docker images to the latest versions Reduces the need to bump versions periodically. See merge request !647	2015-05-14 07:52:54 +00:00
Marin Jankovski	fbc6ea5437	GitLab shell version to 2.6.3.	2015-05-14 09:35:34 +02:00
Marin Jankovski	7b90f2c6e9	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-14 09:35:06 +02:00
Stan Hu	28797d3adc	Fix broken view when viewing history of a file that includes a path that used to be another file ... Closes #1598	2015-05-13 21:03:27 -07:00
Stan Hu	cfe6013b96	Use apt repositories to upgrade Docker builds to the latest GitLab version ... Reduces the need to bump versions periodically.	2015-05-13 20:31:23 +00:00
Robert Speicher	7f2fb72a0a	Minor RelativeLinkFilter cleanup	2015-05-13 14:08:37 -04:00