20847 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douwe Maan	d6a5b45c8e	Recognize issue/MR/snippet/commit links as references.	2015-11-30 21:36:34 +01:00
Douwe Maan	a7be01cd07	Render commit range reference with short shas, link to full shas.	2015-11-30 21:10:52 +01:00
Douwe Maan	8f43298d96	Show local issues and MRs in "This X closes... / closed by..." sentence	2015-11-30 21:09:36 +01:00
Douwe Maan	a8e05cec00	Merge branch 'rs-build-ssh-path-prefix' into 'master' ... Simplify `build_gitlab_shell_ssh_path_prefix` See merge request !1928	2015-11-30 13:15:21 +00:00
Dmitriy Zaporozhets	d73d2a5e58	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-11-30 10:24:40 +01:00
Dmitriy Zaporozhets	f41634c7f6	Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' ... Show Gmail actions links only on expected set of emails See merge request !1901	2015-11-30 09:23:56 +00:00
Dmitriy Zaporozhets	69e9c4143b	Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce	2015-11-30 10:23:25 +01:00
Dmitriy Zaporozhets	c48518ac21	Merge branch 'fix-admin-page-personal-projects' into 'master' ... Fix Error 500 when viewing user's personal projects from admin page This is a regression introduced in 4d7f00f. Closes #3680 Closes https://github.com/gitlabhq/gitlabhq/issues/9861 Closes gitlab-org/gitlab-ee#90 See merge request !1909	2015-11-30 09:18:59 +00:00
Dmitriy Zaporozhets	0a1b50ef3f	Merge branch 'rs-clone-panel' into 'master' ... Add clipboard button for project clone panel Closes #3585 Project:  Wiki:  See merge request !1896	2015-11-30 09:17:39 +00:00
Dmitriy Zaporozhets	2abe9598c1	Merge branch 'rs-update-jquery-turbolinks' into 'master' ... Bump jquery-turbolinks to ~> 2.1.0 See #2857 See merge request !1922	2015-11-30 09:15:20 +00:00
Dmitriy Zaporozhets	b4d40c16c2	Merge branch 'phantomjs' into 'master' ... Use new phantomjs source Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages. Fixes #3722 See merge request !1924	2015-11-30 09:12:53 +00:00
Robert Speicher	e1522ec855	Simplify build_gitlab_shell_ssh_path_prefix	2015-11-29 17:52:40 -05:00
Achilleas Pipinellis	bb6ce2bb10	Test using a 1.9.8 phantomjs version built with fpm ... https://gitlab.com/axil/phantomjs-debian	2015-11-29 13:44:19 +02:00
Achilleas Pipinellis	7d6323a9d4	Update phantomjs to 2.0.0 ... * Version 1.9 was removed from upstream Debian repos	2015-11-29 11:51:02 +02:00
Achilleas Pipinellis	15291c8974	Merge branch 'remove-satellites-reference' into 'master' ... Remove reverence to satellites Remove reference in backup docs See merge request !1923	2015-11-28 22:20:26 +00:00
Robert Schilling	85ad2140fa	Remove reverence to satellites [ci skip]	2015-11-28 20:53:17 +01:00
Sytse Sijbrandij	db1fe56a0e	Merge branch 'doc_public_access' into 'master' ... Update public access documentation See merge request !1837	2015-11-28 07:08:17 +00:00
Robert Speicher	344cb89718	Bump jquery-turbolinks to ~> 2.1.0 ... See #2857	2015-11-27 16:34:59 -05:00
Robert Speicher	3723182a88	Move project visibility level off of the clone panel	2015-11-27 16:15:06 -05:00
Robert Speicher	3c2914b486	Merge branch 'nginx-workhorse-upload-limit' into 'master' ... Nginx workhorse upload limit See merge request !1919	2015-11-27 19:41:02 +00:00
Robert Speicher	f1710073b4	Fix alignment ... [ci skip]	2015-11-27 14:39:55 -05:00
Jacob Vosmaer	04049b6b17	Fix indentation in NGINX config	2015-11-27 13:57:53 +01:00
Jacob Vosmaer	295d378e9a	Repeat "client_max_body_size 0" everywhere ... It turns out that if we do not the declaration from "location /" wins.	2015-11-27 13:56:26 +01:00
Douwe Maan	8f4b6d51f0	Merge branch 'jcorcuera/gitlab-ce-issue_3428'	2015-11-27 12:53:10 +01:00
Stan Hu	312e3b1e16	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	2015-11-26 08:14:10 -08:00
Stan Hu	2f90e71fd3	Merge pull request #9670 from janten/gravatar-retina ... Add support for HiDPI displays in gravatar service	2015-11-26 08:13:28 -08:00
Stan Hu	78c1ab40e2	Gracefully handle when Redis is not available	2015-11-26 07:55:21 -08:00
Jose Corcuera	b9df1a6355	Strip attributes for Milestone and Issuable. #3428	2015-11-26 10:16:50 -05:00
Douwe Maan	68a4533818	Merge branch 'rs-markdown-preview' into 'master' ... Decouple Markdown previews from DropzoneInput See merge request !1908	2015-11-26 13:05:25 +00:00
Douwe Maan	c887045cd2	Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow'	2015-11-26 14:03:51 +01:00
Dmitriy Zaporozhets	1befbbf57d	Merge branch 'rs-remove-enumerize' into 'master' ... Remove enumerize gem Closes #2803 See merge request !1912	2015-11-26 09:03:04 +00:00
Dmitriy Zaporozhets	21003c0cb2	Merge branch 'rs-update-asana' into 'master' ... Bump asana to ~> 0.4.0 Closes #2830 See merge request !1911	2015-11-26 09:01:52 +00:00
Dmitriy Zaporozhets	b501ce0438	Merge branch 'rs-update-doorkeeper' into 'master' ... Bump doorkeeper to ~> 2.2.0 Closes #2746 See merge request !1910	2015-11-26 09:01:23 +00:00
Stan Hu	1a8d4ded19	Merge branch 'fix-dup-changelog-entry' into 'master' ... Remove duplicate CHANGELOG entry shipped in 8.1.4 See merge request !1914	2015-11-26 01:07:47 +00:00
Stan Hu	7adfb30c34	Remove duplicate entry shipped in 8.1.4	2015-11-25 17:06:36 -08:00
Dmitriy Zaporozhets	6bc38b9c8f	Merge branch 'rs-rescueexception-cop' into 'master' ... Enable the Lint/RescueException cop See merge request !1894	2015-11-26 00:34:26 +00:00
Robert Speicher	5f0d1f30b0	Remove enumerize gem	2015-11-25 17:06:04 -05:00
Robert Speicher	91c0aa5e98	Bump asana to ~> 0.4.0 ... Closes #2830	2015-11-25 17:03:30 -05:00
Robert Speicher	59cc61e246	Bump doorkeeper to ~> 2.2.0 ... Closes #2746	2015-11-25 17:01:02 -05:00
Stan Hu	36bde0fcb1	Fix Error 500 when viewing user's personal projects from admin page ... This is a regression introduced in 4d7f00f. Closes #3680	2015-11-25 14:00:35 -08:00
Robert Speicher	73eca2a95e	Decouple Markdown previews from DropzoneInput	2015-11-25 16:36:04 -05:00
Douglas Barbosa Alexandre	8dcef120cd	Fix raw private snippets access workflow	2015-11-25 18:16:27 -02:00
Stan Hu	e55473ad68	Expire application settings from cache at startup ... If a DB migration occurs, there's a chance that the application settings are loaded from the cache and provide stale values, causing Error 500s. This ensures that at startup the settings are always refreshed. Closes #3643	2015-11-25 11:30:33 -08:00
Dmitriy Zaporozhets	dee28c50a9	Merge branch 'new-member-page' into 'master' ... Improve group and project members pages * Improve UI for group members page * Improve UI for project members page For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057 This MR should solve usability problem with adding new member to group/project See merge request !1886	2015-11-25 18:20:22 +00:00
Marin Jankovski	5c0be319cc	Remove some repetition in notify spec.	2015-11-25 13:59:03 +01:00
Marin Jankovski	5613592727	If action link is not found, return nil.	2015-11-25 13:53:02 +01:00
Dmitriy Zaporozhets	913b408c02	Merge branch 'bump-gitlab-shell' into 'master' ... Bump gitlab-shell to 2.6.8 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For gitlab/gitlabhq#2635 See merge request !1939	2015-11-25 12:52:41 +00:00
Marin Jankovski	7da750cc30	Specs for links in email notifications for Gmail Actions.	2015-11-25 13:27:31 +01:00
Dmitriy Zaporozhets	18a5f91ed6	Bump gitlab-shell to 2.6.8 ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-11-25 13:08:47 +01:00
Yorick Peterse	ef2bc0f0bf	Merge branch 'sherlock-total-query-time' into 'master' ... Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887	2015-11-25 11:29:48 +00:00