2801 Commits

Include renames

Author	SHA1	Message	Date
Jacob Schatz	1142b327e8	Merge branch 'dz-small-ui-fixes' into 'master' ... Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758	2016-02-23 15:38:20 +00:00
Jacob Schatz	6263a3ca3c	Merge branch 'files-view-row-click' into 'master' ... Fixes issue with file view rows not clickable on project main view Fixed an issue where it would only load the first 25 commit data on project main view. Stopped the file view sending 1 too many requests. Fixes #3916 See merge request !2933	2016-02-23 14:52:21 +00:00
Jacob Schatz	06f7fd2fb7	Merge branch 'empty-repo-instructions-fix' into 'master' ... Users don't get instructions to push to other users empty projects Fixes #12518  See merge request !2923	2016-02-23 14:07:36 +00:00
Phil Hughes	d80205b755	Fixes issue with file view rows not clickable on project main view ... Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916	2016-02-23 09:06:26 +00:00
Phil Hughes	62f4a9de19	Users don't get instructions to push to other users empty projects ... Fixes #12518	2016-02-22 17:37:26 +00:00
Phil Hughes	fbc578a7ec	Added line links to blame table ... Closes #4119	2016-02-22 14:09:13 +00:00
Phil Hughes	51c17329a4	Fixed failing issues tests ... Removed up/down vote icons from merge requests. Was missed from d8069bd858	2016-02-22 11:35:52 +00:00
Phil Hughes	d8069bd858	Only show up or down votes icon on issue list if there are any ... Closes #13649	2016-02-22 10:21:02 +00:00
Douwe Maan	31682eb987	Merge branch 'visibletrap/gitlab-ce-label'	2016-02-19 17:54:13 -08:00
Douwe Maan	3a97a5ddfd	Merge branch 'rs-blob' into 'master' ... Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887	2016-02-20 01:12:52 +00:00
Douwe Maan	c352aaa008	Merge branch '12792-emoji-as-text-diff-comment'	2016-02-19 16:59:36 -08:00
Jacob Schatz	de84fa365e	Merge branch 'issue_3276' into 'master' ... Labels should be visible in milestone view Closes #3276 See merge request !2599	2016-02-19 19:44:13 +00:00
Robert Speicher	a5c7aea3a9	Merge branch 'issue_3409' into 'master' ... Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990	2016-02-19 18:39:31 +00:00
Rémy Coutable	803d6f8f05	Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' ... Consistency in MR and issue header. Fixes: #13550  See merge request !2874	2016-02-19 18:21:42 +00:00
Rubén DávilaandRobert Speicher	5ef3f80d41	More updates from the last code review.	2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher	169070ba4b	Some updates from last code review.	2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher	d958d027dc	Make #commit_with_hooks return the new obj id plus some other fixes.	2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher	d34733efc4	Don't show revert button if commit/MR has already been reverted.	2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher	e8d15f1339	Refactor revert_commit_link helper.	2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher	5ad78cdbda	Use a custom title in the revert modal.	2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher	ccd2a8d6b5	Show a tooltip on revert link.	2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher	477ae66b4d	Move revert link to the MR widget section plus some refactor.	2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher	328b52d58a	Some updates after last code review.	2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher	38e708f0ce	Add link to fork if user can't revert MR.	2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher	4dc8350517	Reuser revert commit modal in MR detail page.	2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher	b0693318c3	Show list of branches plus some fixes.	2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher	34e26b8212	Add button to revert commit on Commit detail page.	2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher	006089f972	Add new endpoint and button to revert any commit.	2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher	b6fe51b901	Some updates from last code review.	2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher	d3c2437328	Add new endpoint and button to revert merge. #3409	2016-02-19 13:14:48 -05:00
Grzegorz Bizon	7d5a182624	Use POST method instead of DELETE when erasing a build ... Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042	2016-02-19 17:24:59 +01:00
Grzegorz Bizon	08b8f48929	Improve build view for erased build details	2016-02-19 17:24:59 +01:00
Grzegorz Bizon	cf38608486	Use button groups in build summary for consistency	2016-02-19 17:24:59 +01:00
Grzegorz Bizon	293999cabb	Fix name of build erasable, remove superfluous method from it	2016-02-19 17:24:59 +01:00
Grzegorz Bizon	b14c9fcdbb	Fix date in alert saying that build has been erased	2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon	21152d7d51	Use DELETE verb for erasing a build content ... Also added API specs for that	2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon	6ca99bd899	And CI API endpoint where user can erase a build	2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon	ede451c851	Show information indicating that build has been erased	2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon	c8102d938b	Add build eraseable feature implementation	2016-02-19 17:24:03 +01:00
Grzegorz Bizon	c1affed196	Add build remove button to build summary view	2016-02-19 17:24:03 +01:00
Zeger-Jan van de Weg	11ed1cbbb7	Emoji reponses on diffs aren't award emoji	2016-02-19 10:04:38 +01:00
Tap	c48ac79c18	Pull right side of label row out	2016-02-19 13:50:56 +08:00
Robert Speicher	8c454b3624	Add a Blob model that wraps Gitlab::Git::Blob ... This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.	2016-02-18 22:45:30 -05:00
Alfredo Sumaran	099a299338	Move visibility icon next to project title	2016-02-18 18:08:11 -05:00
Jacob Schatz	41866055c8	Consistency in MR and issue header.	2016-02-18 11:19:06 -05:00
Kamil Trzciński	c943dae6c1	Merge branch 'rs-git-fetch-labels' into 'master' ... Fix labels for git clone/git fetch Project CI setting See merge request !2842	2016-02-18 12:37:35 +00:00
Douwe Maan	ff28ac9c18	Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' ... Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options  * Most popular  * Least popular  See merge request !2781	2016-02-17 17:20:35 +00:00
Douwe Maan	cb2591e83f	Merge branch 'image-diff' into 'master' ... Fixes for showing images - Render scrubbed SVG's inline, not via /raw/ - Use /raw/ requests on image diffs Both of these are needed because of no longer eager loading blobs. This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830 Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350 See merge request !2837	2016-02-17 14:06:10 +00:00
Douwe Maan	534d480993	Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into 'master' ... Fix a bug preventing from doing subsequent edits in any Issuable sidebar Fixes #13517. Fixes #12572. ### Issue  --- ### Merge request  /cc @jschatz1 @sytses See merge request !2848	2016-02-17 14:01:30 +00:00
Tap	2e81b1558b	Label description and Label row ... - Add label description - Show label row when filtering issues or merge requests by label	2016-02-17 21:52:12 +08:00