18218 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stan Hu	494afae08d	Merge branch 'mysql_insecure_password_warnings' into 'master' ... Workaround the insecure password warnings emitted by MySQL 5.6 When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1. ``` Warning: Using a password on the command line interface can be insecure. ``` This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable. See merge request !1139	2015-08-14 17:12:57 +00:00
Stan Hu	317b7ad3e8	Merge pull request #9528 from revaret/Fixed_alignment_issue ... Fix for #9527	2015-08-14 09:12:34 -07:00
Stan Hu	d416a9d624	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-14 08:51:49 -07:00
Stan Hu	5824766252	Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update ... Update Flowdock integration to support new Flowdock API	2015-08-14 08:34:51 -07:00
Boyan Tabakov	88ab815b38	Update Flowdock integration to support new Flowdock API ... Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.	2015-08-14 16:45:23 +02:00
Dmitriy Zaporozhets	3483024d93	Merge branch 'disable-internal-tracker-when-external-in-use' into 'master' ... Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993	2015-08-14 11:01:43 +00:00
Dmitriy Zaporozhets	b6bdd650a5	Merge branch 'improve-readability' into 'master' ... Set max-width for README, issue and merge request description It allows easier text reading on big screens ### Problem Text is hard to read on wide screens:  ### Solution Set max-width to content. Screenshots:   Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1161	2015-08-14 10:55:08 +00:00
Dmitriy Zaporozhets	8b9c129016	Add CHANGELOG item ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-14 11:35:48 +02:00
Dmitriy Zaporozhets	ec910c3307	Set max-width for README, issue and merge request description ... It allows easier text reading on big screens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-14 11:29:45 +02:00
Dmitriy Zaporozhets	e8889b154e	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-14 11:20:39 +02:00
Dmitriy Zaporozhets	5f2562dfc5	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-14 11:20:18 +02:00
Dmitriy Zaporozhets	b665833370	Merge branch 'respect_filters' into 'master' ... Fix: User search feature in admin area does not respect filters https://dev.gitlab.org/gitlab/gitlabhq/issues/2482 See merge request !1155	2015-08-14 08:35:16 +00:00
Valery Sizov	e58e75aa88	Fix: User search feature in admin area does not respect filters	2015-08-13 17:51:20 +03:00
ranjith	22eddffd41	Fixed #9527	2015-08-13 19:48:10 +05:30
Stan Hu	f6f58cfb1f	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-13 07:17:21 -07:00
Stan Hu	a8e4c391cd	Merge pull request #9556 from pupaxxo/patch-3 ... Fix changelog	2015-08-13 07:16:49 -07:00
Job van der Voort	d891b23e62	Merge branch 'add-image' into 'master' ... New doc about how to add an image in GitLab Basics See merge request !1918	2015-08-13 12:05:16 +00:00
Robert Schilling	f34c0b6a12	Merge pull request #9557 from pupaxxo/patch-4 ... Time for 7.14.0.pre	2015-08-13 13:46:51 +02:00
Dmitriy Zaporozhets	00a33d67aa	Merge branch 'improve-hipchat-service-test' into 'master' ... Provide more feedback what went wrong if HipChat service failed test This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks. Screenshot:  Issue gitlab-com/support-forum#213 See merge request !1144	2015-08-13 11:43:44 +00:00
Andrea Ruggiero	b3b0a1890e	Time for 7.14.0.pre	2015-08-13 13:25:54 +02:00
Dmitriy Zaporozhets	167ab75365	Merge branch 'bring-clonebar-back' into 'master' ... Bring clone bar back Screenshot:  See discussion in !1080 See merge request !1147	2015-08-13 10:56:01 +00:00
Valery Sizov	3a84b45b51	Merge branch 'update_changelog' into 'master' ... Update changelog See merge request !1153	2015-08-13 09:50:48 +00:00
Valery Sizov	fc7e63236e	update chnagelog	2015-08-13 12:49:26 +03:00
Andrea Ruggiero	b70988b4d6	Fix changelog	2015-08-13 11:25:10 +02:00
Stan Hu	7d1c06793e	Merge branch 'note-query-information' into 'master' ... Note query information See merge request !1149	2015-08-12 23:36:29 +00:00
Stan Hu	e956d116c5	Merge branch 'more-markdown-extensions' into 'master' ... markup_helper: detect .mkd and .mkdn as markdown See merge request !1148	2015-08-12 23:18:05 +00:00
Ben Boeckel	95f8f7c729	api: add 'system', 'upvote', and 'downvote' fields to note queries ... This reverts commit 4c586dc7c2.	2015-08-12 17:02:33 -04:00
Stan Hu	518aa7dca6	Bring clone bar back ... See discussion in !1080	2015-08-12 14:00:59 -07:00
Ben Boeckel	013260e057	markup_helper: detect .mkd and .mkdn as markdown	2015-08-12 15:29:15 -04:00
Dmitriy Zaporozhets	6a82c9f018	Merge branch 'mr-merge-manually-2' into 'master' ... Move merge manually text below merge widget Replace !1121 Screenshot: #### Before  #### After  See merge request !1141	2015-08-12 16:06:16 +00:00
Ted Strzalkowski	7430e7b5fc	Workaround the warnings emitted by MySQL 5.6 regarding password on the ... command line.	2015-08-12 07:51:24 -07:00
Stan Hu	2379057002	Provide more feedback what went wrong if HipChat service failed test ... Issue gitlab-com/support-forum#213	2015-08-12 07:31:25 -07:00
Dmitriy Zaporozhets	cd579cb2ff	Merge pull request #9545 from Baldinof/add_merged_label ... Add merged label on branches page	2015-08-12 14:30:42 +02:00
karen Carias	235acd2226	fixed text	2015-08-11 19:18:20 -07:00
karen Carias	1df163866f	fixed text	2015-08-11 19:16:13 -07:00
Florent (HP)	8adf6ba8f5	Add merged label on branches page	2015-08-11 23:00:46 +02:00
Dmitriy Zaporozhets	3c036ea157	Fix changelog ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 19:56:11 +02:00
Dmitriy Zaporozhets	ff10543403	Move merge manually text below merge widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 19:55:01 +02:00
Dmitriy Zaporozhets	cb6ad67f52	Merge branch 'check-out-branch-button' into 'master' ... Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.  It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:  cc @dzaporozhets @rspeicher See merge request !1116	2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets	a0cd4f8fb4	Merge branch 'improve-merge-request-widget' into 'master' ... Improve merge request widget Return merge request widget improvements that were reverted with satellites See merge request !1140	2015-08-11 17:46:38 +00:00
Dmitriy Zaporozhets	91836272fe	Merge branch 'mr-widget-text' into 'master' ... Improve text of MR merge widget and manual merge modal Modal with manual merge instructions:  Archived:  WIP:  Missing target branch:  Missing source branch:  Nothing to merge:  Checking ability to merge:  Conflicts when allowed to merge:  Conflicts when not allowed to merge:  Mergeable when allowed to merge:  Mergeable when not allowed to merge:  Merge in progress:  Merge failed:  Merged:  Closed:  cc @dzaporozhets @rspeicher See merge request !1120	2015-08-11 19:24:50 +02:00
Dmitriy Zaporozhets	eaba65fe50	Move command line insturction out of mr widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 19:24:42 +02:00
Dmitriy Zaporozhets	48e76c04a7	Refactor merge request widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 19:17:02 +02:00
Dmitriy Zaporozhets	3e0ba775ed	Move command line insturction out of mr widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 19:15:49 +02:00
Dmitriy Zaporozhets	630a9421ed	Merge branch 'optimize-haml-textarea-rendering' into 'master' ... Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984	2015-08-11 17:10:45 +00:00
Dmitriy Zaporozhets	fed202f677	Merge branch 'grit_blame' into 'master' ... Fast blame Improve performance for file blame page. Also bring some small UI improvements See merge request !1129	2015-08-11 14:45:54 +00:00
Dmitriy Zaporozhets	50b1f09ab2	Small UI improvements to git blame page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 16:24:29 +02:00
Dmitriy Zaporozhets	43e1520033	Merge branch 'drop-username-tree-row' into 'master' ... Drop the user name from tree row to improve readability of commit messages Follow up to MR !579 /cc @dzaporozhets See merge request !1124	2015-08-11 13:57:47 +00:00
Dmitriy Zaporozhets	59176c1026	Merge branch 'master' into 'master' ... Link username to profile on Group Members page When browsing a GitLab group, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless. See merge request !1099	2015-08-11 13:56:11 +00:00
Dmitriy Zaporozhets	c0bf026ed8	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-11 14:29:43 +02:00