4837 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	499154518a	You can not remove user if he/she is an only owner of group ... To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-28 12:00:02 +02:00
Douwe Maan	06250eef2e	Merge branch 'fix-git-blame-syntax-highlighting' into 'master' ... Fix git blame syntax highlighting when different commits break up lines ### What does this MR do? This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead. ### Why was this MR needed? When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line. However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp):  The fixed version looks like this:  This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer. * https://github.com/rumpelsepp/rugments/pull/24 * https://github.com/rumpelsepp/rugments/pull/23 * Also submitted to rouge: https://github.com/jneen/rouge/pull/267 ### What are the relevant issue numbers? Closes #1521 See merge request !697	2015-05-28 09:40:00 +00:00
Jeroen van Baarsen	5322099464	Merge pull request #9184 from rumpelsepp/english ... Some language improvements	2015-05-28 10:43:41 +02:00
Dmitriy Zaporozhets	72e410965d	Merge branch 'rs-persist-tab-selection' into 'master' ... Persist current merge request tab selection via URL Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350 See merge request !728	2015-05-28 07:49:15 +00:00
Dmitriy Zaporozhets	72f1889825	Merge branch 'header-icons' into 'master' ... Change some header icons icons changed: * profile settings: user icon to cog * admin area: cogs to wrench Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290  See merge request !726	2015-05-28 07:47:14 +00:00
Robert Speicher	5c52eaa9d2	Persist current merge request tab selection via URL ... Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350	2015-05-27 22:39:11 -04:00
Stan Hu	0cd73885e6	Fix git blame syntax highlighting when different commits break up lines ... Closes #1521	2015-05-27 14:10:58 -07:00
Stefan Tatschner	2fa3af047e	Some language improvements	2015-05-27 21:44:04 +02:00
Dmitriy Zaporozhets	6cf45dde0c	Replace some icons in header ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-27 17:56:36 +02:00
Steve Norman	10871732df	Use entity number for plus sign	2015-05-27 13:04:18 +00:00
Douwe Maan	7a11ef3e95	Add Browse Issues button to Dashboard and Group milestones.	2015-05-27 14:23:04 +02:00
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	4146ce559e	Merge branch 'profile-in-sidebar' into 'master' ... Move user avatar and logout button to sidebar Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !719	2015-05-27 11:52:53 +00:00
Dmitriy Zaporozhets	fcc0ff2ccd	Merge branch 'nav-settings' into 'master' ... Clarify navigation labels for Project Settings and Group Settings. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337. See merge request !703	2015-05-27 11:48:33 +00: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
Dmitriy Zaporozhets	56ab471f98	Move user avatar and logout button to sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-27 13:17:14 +02:00
Dmitriy Zaporozhets	701c2e9a3b	Merge branch 'rs-to_reference' into 'master' ... Add to_reference method to referable models Now there is a single source of information for which attribute a model uses to be referenced, and its special character. See merge request !641	2015-05-27 10:03:14 +00:00
Dmitriy Zaporozhets	3ed05b2191	Merge branch 'rs-manual-2fa-entry' into 'master' ... Add support for manually entering 2FA details >  Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694	2015-05-27 09:53:40 +00:00
Robert Speicher	cc0f223858	Merge branch 'fix-typo-in-email' into 'master' ... Fix "Asignee" typo in new issue/merge request emails See merge request !676	2015-05-26 21:47:04 +00:00
Robert Speicher	35853033b9	Fix for Snippets with a project	2015-05-26 15:48:32 -04:00
Dmitriy Zaporozhets	f955554d0f	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-26 20:32:55 +02:00
Dmitriy Zaporozhets	b11bcb8a74	Use default control for search field in header ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-26 20:32:11 +02: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	0c8d8b91e0	Clarify navigation labels for Project Settings and Group Settings.	2015-05-25 17:18:24 +02: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
Robert Speicher	e73ea12695	Add support for manually entering 2FA details	2015-05-23 15:04:40 -04: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
Dmitriy Zaporozhets	f5f0ed55bd	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-18 17:58:22 +03:00
Ben Boeckel	b8571f141e	email: fix typo	2015-05-18 09:33:16 -04:00
Douwe Maan	b606bfdcaf	Fix copy.	2015-05-17 18:11:41 +02:00
Robert Speicher	c7ae428b4c	Fix labels for project/snippet visibility selection	2015-05-16 16:09:04 -04:00