18189 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
Dmitriy Zaporozhets	7f3228ec74	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-11 14:29:36 +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
Valery Sizov	cf6e58b589	update gitlab_git	2015-08-11 15:11:58 +03:00
Dmitriy Zaporozhets	3a63c00505	Fix file api tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 13:47:37 +02:00
Dmitriy Zaporozhets	b9b9fe70b8	Revert "Fix editing files via API" ... This reverts commit 7bde6ae540.	2015-08-11 13:29:35 +02:00
Dmitriy Zaporozhets	9d029a05f1	Revert "Merge branch 'web-editor-rugged' into 'master'" ... This reverts commit 5a1aa49b55, reversing changes made to a675bea2c1. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 13:04:38 +02:00
Dmitriy Zaporozhets	40b1703263	Fix gemfile ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:53:49 +02:00
Dmitriy Zaporozhets	9bc512314a	Revert "Create and edit files in web editor via rugged" ... This reverts commit 734a4ba87d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:52:33 +02:00
Dmitriy Zaporozhets	0806605962	Revert "Fix adding new file to empty repo" ... This reverts commit 27a158506e. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:51:26 +02:00
Dmitriy Zaporozhets	815e678c4e	Revert "Use rugged in web editor for base64 encoding" ... This reverts commit 541133197b.	2015-08-11 11:50:48 +02:00
Dmitriy Zaporozhets	34975f0180	Revert "Create activity event and execute hooks on web editor commit" ... This reverts commit 3d416f1682.	2015-08-11 11:50:43 +02:00
Dmitriy Zaporozhets	24332b7b99	Revert "Make web editor work correctly after switch from satellites" ... This reverts commit 435f680b89.	2015-08-11 11:49:29 +02:00
Dmitriy Zaporozhets	d4cfa0bf76	Revert "Refactor web editor" ... This reverts commit dfccb06dda. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:49:09 +02: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	1891cab44c	Fix conflict issue ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 11:12:35 +02:00
Dmitriy Zaporozhets	3b02ad8467	Revert "Merge branches inside one repository using rugged instead of satellites" ... This reverts commit d24c40ec21.	2015-08-11 10:50:39 +02:00
Dmitriy Zaporozhets	32046983ad	Revert "Merge branch 'refactor-can-be-merge' into 'master'" ... This reverts commit 459e6d3467, reversing changes made to 804168e1de. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 10:48:02 +02:00
Dmitriy Zaporozhets	9f10943c1a	Revert "Merge branch 'drop-satellites'" ... This reverts commit 957e849f41, reversing changes made to 6b9dbe9f5a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets	84727fba96	Revert "Merge branch 'improve-merge-requests' into 'master' " ... This reverts commit 4773f38e28, reversing changes made to 0d5d80b735.	2015-08-11 10:26:19 +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
Douwe Maan	b514a5ee06	Merge branch 'disable-turbolinks-for-bitbucket' into 'master' ... 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 occurred:  Closes #2241 See merge request !1131	2015-08-11 08:00:29 +00:00
Job van der Voort	b8d48ca84f	Merge branch 'notifications' into 'master' ... Info about not receiving emails Added additional info because of issue https://gitlab.com/gitlab-com/support-forum/issues/268#note_1846073 See merge request !1920	2015-08-11 07:43:12 +00:00