1706 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	511791014e	Fix milestone "Browse Issues" button.	2015-05-27 14:23:04 +02:00
Douwe Maan	45e4727f97	Set milestone on new issue when creating issue from index with milestone filter active.	2015-05-27 14:22:11 +02:00
Dmitriy Zaporozhets	9eec0d5436	Merge branch 'accepted-rejected-mrs' into 'master' ... Add Accepted and Rejected tabs to MR lists. Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.    Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702	2015-05-27 11:40:36 +00:00
Jeroen van Baarsen	aa36a19613	Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation ... Validate wiki page creation	2015-05-26 20:05:25 +02:00
Jeroen van Baarsen	b16aad9dd1	Validate wiki page creation ... **What does this do?** It adds validation to the creation of a wiki page, that way the user gets real feedback instead of just a 404 page if the name of the wiki page was invalid **Why is this needed?** There are a lot of characters that are not allowed in the creation of a wiki page, there is even a small text that is saying: Please don't use spaces. Although we have that text there, we don't actually validate on this. This commit adds validation on the title and gives the user actual feedback. **What issues does this fix?** Fixes http://github.com/gitlabhq/gitlabhq/issues/5357 Fixes https://github.com/gitlabhq/gitlabhq/issues/8565 Fixes https://github.com/gitlabhq/gitlabhq/issues/3913 Fixes https://github.com/gitlabhq/gitlabhq/issues/8166 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-05-26 19:01:11 +02:00
Dmitriy Zaporozhets	b5ea355078	Merge branch 'rs-link_to_label' into 'master' ... Add link_to_label helper The primary purpose of this change was to make the actual labels on `Labels#index` clickable. See merge request !690	2015-05-26 15:09:04 +00:00
Stan Hu	9bcd36396b	Refactor permission checks to use can? instead of issues_enabled and merge_requests_enabled	2015-05-25 16:51:04 -07:00
Douwe Maan	d25026a512	Add Accepted and Rejected tabs to MR lists.	2015-05-25 17:01:27 +02:00
Douwe Maan	ebe9c89082	Consistently refer to MRs as either Accepted or Rejected.	2015-05-25 17:01:14 +02:00
Douwe Maan	04d4452286	Merge branch 'disabled-issues-mr-features' into 'master' ... Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings Closes #1676 See merge request !691	2015-05-25 12:04:55 +00:00
Stan Hu	a7d8a7bd3d	Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings ... Closes #1676	2015-05-25 06:16:33 -04:00
Douwe Maan	2d0a9c4cc2	Merge branch 'add-webhook-note-events' into 'master' ... Add support for Webhook note events This MR adds support for note events (comments) for WebHooks. Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think? Screenshot after:  Closes https://github.com/gitlabhq/gitlabhq/issues/6745 See merge request !673	2015-05-25 07:57:52 +00:00
Stan Hu	7a7ce70169	Use the user list from the target project in a merge request ... Closes #1535	2015-05-22 09:52:09 -04:00
Stan Hu	deeff56967	Add support for Webhook note events ... Closes https://github.com/gitlabhq/gitlabhq/issues/6745	2015-05-21 23:48:16 -04:00
Robert Speicher	4e2ee018c3	Make the actual labels on Labels#index links ... Now the user can click the labels themselves or the "X open issues" text.	2015-05-21 23:43:08 -04:00
Robert Speicher	9bdd7f34a5	Add link_to_label helper	2015-05-21 23:40:25 -04:00
Douwe Maan	9a60441ce4	Fix Atom feeds.	2015-05-21 11:39:33 +02:00
Job van der Voort	3a3f4b41e6	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-21 10:38:22 +02:00
Job van der Voort	90b1019ab4	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-21 10:37:58 +02:00
Alex ConnorandJeroen van Baarsen	3c892f3554	Disabled expansion of top/bottom blobs for new file diffs	2015-05-21 09:25:07 +02:00
Dmitriy Zaporozhets	76a758234a	Merge branch 'explain-wip-mr' into 'master' ... Add explanation about WIP status to MR form.   See merge request !666	2015-05-20 12:08:51 +00:00
Douwe Maan	a393d6b163	Remove italics and margin from merge request form help.	2015-05-20 14:00:45 +02:00
Dmitriy Zaporozhets	15a6211e81	Small css improvements	2015-05-19 21:15:41 +03:00
Jakub Jirutka	b0659c1b07	Simplify and unify helpers for rendering markup	2015-05-18 22:52:13 +02:00
Douwe Maan	b606bfdcaf	Fix copy.	2015-05-17 18:11:41 +02:00
Douwe Maan	c74375ae60	Add explanation about WIP status to MR form.	2015-05-15 13:50:04 +02:00
Dmitriy Zaporozhets	de1aca131e	Merge branch 'spinner-spin' into 'master' ... Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655	2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets	3d4d89f060	Use count badges with number_with_delimiter helper for issue, commit count	2015-05-14 18:30:23 +03:00
Douwe Maan	191bb46d74	Use slightly fewer icons in project sidebar.	2015-05-14 17:02:00 +02:00
Douwe Maan	0b098060cc	Spin icon next to "Checking for CI status..."	2015-05-14 13:27:22 +02:00
Douwe Maan	74770137f6	Always show note action icons.	2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets	b0b25e37c9	Merge branch 'note-role' into 'master' ... Show user roles by comments. I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.  On hover, the note actions replace the role:  --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639	2015-05-12 11:28:39 +00:00
Douwe Maan	b0af379a22	Show user roles by comments.	2015-05-12 12:16:34 +02:00
Douwe Maan	4346c39ba9	Move "Forked from" above "Version".	2015-05-12 10:29:59 +02:00
Douwe Maan	a5ce66d836	Move clone panel to bottom of project sidebar.	2015-05-12 10:28:56 +02:00
Douwe Maan	bfe2384797	Restructure project sidebar.	2015-05-12 10:27:17 +02:00
Douwe Maan	e9dff9f410	Fix alignment of ref picker, breadcrumb and buttons.	2015-05-12 10:27:17 +02:00
Douwe Maan	71a1689fec	Add icons to more tabs.	2015-05-12 10:27:17 +02:00
Douwe Maan	aa4d199044	Fix commits feed button.	2015-05-10 00:39:20 +02:00
Douwe Maan	164d474488	Add Merge Request button to branches page.	2015-05-09 22:55:19 +02:00
Douwe Maan	722e393589	Add Create Merge Request buttons to commits page and push event.	2015-05-09 22:26:52 +02:00
Douwe Maan	8f75ab21d0	Link Commits tab to current branch from Compare page.	2015-05-09 22:25:52 +02:00
Marin Jankovski	15909d6411	Move project visibility from clone bar to repository details block for non empty project.	2015-05-08 18:12:07 +02:00
Dmitriy Zaporozhets	6c32abc5f7	Merge branch 'rs-task_list' into 'master' ... Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. 👏 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599	2015-05-08 09:39:48 +00:00
Douwe Maan	f5f097b765	Merge branch 'feature/handle-big-diffs' into 'master' ... Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. See merge request !539	2015-05-07 19:29:55 +00:00
Robert Speicher	725ff58bc8	Don't add js-task-list-container to things the user can't edit	2015-05-06 13:00:13 -04:00
Robert Speicher	5c7b91e29b	Single quotes/icon helper in views	2015-05-06 13:00:11 -04:00
Robert Speicher	6883e6e084	Remove all references to parse_tasks	2015-05-06 12:58:28 -04:00
Robert Speicher	ce29e5cd8f	Update task list behavior for Merge Requests	2015-05-06 12:58:27 -04:00
Robert Speicher	922497560e	Update task list behavior for Notes	2015-05-06 12:58:27 -04:00