1479 Commits

Include renames

Author	SHA1	Message	Date
Artem Sidorenko	3ebbed25f0	Allow listing of archived projects ... Resolves #9285	2015-08-19 13:46:59 +02:00
Dmitriy Zaporozhets	72a425fa66	Merge branch 'remove-satellites' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-19 09:52:39 +02:00
Robert Schilling	7f19d55c7c	Time for 8.0.0.pre	2015-08-19 09:01:22 +02:00
Robert Speicher	204914983a	Merge branch 'fix-authhash-infinite-loop' into 'master' ... Fix infinite loop when SAML was incorrectly configured. See merge request !1170	2015-08-18 15:56:30 +00:00
Stan Hu	2b127c3fd2	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-18 06:46:44 -07:00
Dmitriy Zaporozhets	798f2fe19f	Merge branch 'mr-source-branch-clear-cache' into 'master' ... Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160	2015-08-18 13:16:46 +00:00
Ben Bodenmiller	595a93ee2c	disallow irrelevant pages by default in robots ... Update default robots.txt rules to disallow irrelevant pages that search engines should not care about. This will still allow important pages like the files, commit details, merge requests, issues, comments, etc. to be crawled.	2015-08-17 23:11:16 -07:00
Stan Hu	2a704396fb	Fix incorrect CHANGELOG version	2015-08-17 19:29:06 -07:00
Stan Hu	47d55306d9	Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules ... Closes #2262	2015-08-17 23:56:02 +00:00
Douwe Maan	c16b1651f5	Fix infinite loop when SAML was incorrectly configured.	2015-08-17 16:39:22 -07:00
Douwe Maan	c9920c422d	Merge branch 'fix-backslashes-inline-diff' into 'master' ... Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement:  With this fix, it looks like:  Closes #2253 See merge request !1143	2015-08-17 23:33:36 +00:00
Dmitriy Zaporozhets	4a0fa27017	Merge branch 'master' into remove-satellites ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-17 11:41:53 +02:00
Sven Strickroth	18e9b01059	Update changelog for MR !1124 ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2015-08-15 23:11:04 +02:00
Stan Hu	87ec6ae3a5	Merge branch 'fix/redirect_after_sign_in' into 'master' ... Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control. See merge request !1146	2015-08-14 19:45:01 +00:00
Stan Hu	d416a9d624	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-14 08:51:49 -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
Stan Hu	6e808fc222	Clear cache to prevent listing deleted branches after MR removes source branch ... Closes #2272	2015-08-14 07:09:25 -07: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	8b9c129016	Add CHANGELOG item ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-14 11:35:48 +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
Stan Hu	f6f58cfb1f	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-13 07:17:21 -07: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
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	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	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
Alex Lossent	fb6e8008c4	Fix redirection after sign in when using auto_sign_in_with_provider ... Logic for redirect path moved to a filter.	2015-08-12 17:31:35 +02: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
Stan Hu	c36adb98aa	Fix bug where backslashes in inline diffs could be dropped ... Closes #2253	2015-08-11 18:39:27 -07:00
Florent (HP)	8adf6ba8f5	Add merged label on branches page	2015-08-11 23:00:46 +02:00
Dmitriy Zaporozhets	69c193e78a	Merge branch 'master' into remove-satellites ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 22:48:55 +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	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	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	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	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	d25c56cfd8	Update CHANGELOG ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 14:41:31 +02:00
Dmitriy Zaporozhets	3e259ea8bc	Revert "Merge branch 'revert-satellites' into 'master' " ... This reverts commit 5daf44b7c8, reversing changes made to 2f706fbd23.	2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets	5daf44b7c8	Merge branch 'revert-satellites' into 'master' ... Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136	2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets	79b294267a	Remove changelog items ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:40:39 +02:00
Dmitriy Zaporozhets	f293d991a4	Revert "Merge branch 'mr-widget-text' into 'master' " ... This reverts commit 151d9fb35f, reversing changes made to 819d110cab.	2015-08-11 10:26:12 +02:00
Douwe Maan	2f706fbd23	Merge branch 'fix-broken-code-import' into 'master' ... Fix broken code import and display error messages if something went wrong with creating project Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Also, if the project failed to save for some reason, the user was never informed. Screenshot of new error message dump:  Closes #2241 See merge request !1134	2015-08-11 08:02:49 +00:00
Stan Hu	f1a241e0ed	Fix broken code import and display error messages if something went wrong with creating project ... Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Closes #2241	2015-08-10 23:56:01 -07:00
Stan Hu	e6ef058289	Disable turbolinks when linking to Bitbucket import status ... Turbolinks was causing issues with the Bitbucket Javascript/display because it was trying to intercept /import/bitbucket/status even when a 302 redirection occured. Closes #2241	2015-08-10 11:44:39 -07:00
Nikita Verkhovin	78df90d6b8	Add dropzone upload progress to CHANGELOG	2015-08-10 23:23:54 +06:00
Stan Hu	e051a558ce	Bump Haml to 4.0.7 to speed up textarea rendering ... Closes #1987	2015-08-10 08:02:23 -07:00
Stan Hu	39bda5d05e	Merge branch 'disable-autocrlf-for-binary-files' into 'master' ... Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123	2015-08-10 14:04:07 +00:00
Tom Webster	3bb2aa9f98	Link username to profile on Group Members page ... When browsing GitLab, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless.	2015-08-10 08:32:17 -04:00