8947 Commits

Include renames

Author	SHA1	Message	Date
Douwe MaanandRobert Speicher	41a2fd7cd6	Escape user-provided content in preserved HAML sections	2015-09-08 13:19:17 -04:00
Robert Speicher	57ee993f20	Merge branch 'improve-abuse-reports-stable' into 7-14-stable	2015-08-25 09:22:34 -07:00
Stan HuandRobert Speicher	e8329f0db6	Fix "Reload with full diff" URL button in compare branch view ... This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.	2015-08-25 09:20:20 -07:00
Dmitriy Zaporozhets	3052e6f608	Merge branch 'improve-abuse-reports' into 'master' ... Improve abuse reports management * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report without page reloading Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1196	2015-08-25 12:37:02 +02:00
Stan HuandRobert Speicher	6652fac234	Fix Error 500 in API when accessing a group that has an avatar ... Closes #2340	2015-08-24 12:25:41 -07:00
Stan HuandRobert Speicher	27e2749175	List the current user first in issuable dropdowns	2015-08-21 16:19:29 -07:00
Stan HuandRobert Speicher	3f3f07ef4d	Fix bug preventing invite by e-mail ... This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320	2015-08-21 16:19:25 -07:00
Douwe MaanandRobert Speicher	4ed89992f3	Check permissions on target project in merge request create service.	2015-08-21 11:03:23 -07:00
Douwe MaanandRobert Speicher	032d2442b1	Fix bug where non-project members of the target project could set labels on new merge requests. ... (cherry picked from commit 77e508d8fd)	2015-08-21 09:38:38 -07:00
Stan HuandRobert Speicher	31e897ccef	Fix blame view line groupings ... Closes #2305	2015-08-20 14:27:06 -07:00
Patricio CanoandRobert Speicher	f18e338672	Improved 2FA warning message about lost codes	2015-08-20 13:35:30 -07:00
Robert Speicher	980a33552e	Use File.join instead of Rails.root.join in HelpController	2015-08-19 09:34:17 -07: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	692e381e0c	capitalize URL in "Home page URL"	2015-08-17 23:16:18 -07:00
Douwe Maan	f4cb6e438a	Merge branch 'code-import-error-ui-improvements' into 'master' ... Improve error message display when project fails to import Follow-up to !1134. New screenshot:  See merge request !1138	2015-08-17 23:31:51 +00:00
Dmitriy Zaporozhets	50696ce1d3	Revert "Fix for #9527"	2015-08-17 18:29:54 +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	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
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	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
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
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
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
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
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
Florent (HP)	8adf6ba8f5	Add merged label on branches page	2015-08-11 23:00:46 +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	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	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
Stan Hu	fa58a85ed0	Improve error message display when project fails to import	2015-08-11 06:36:42 -07: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	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	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