17995 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sytse Sijbrandij	764124c380	Merge branch 'revert_touch' into 'master' ... Revert "Update noteable after a new note is added" This reverts commit fbdaf0e2a5. https://gitlab.com/gitlab-org/gitlab-ce/issues/2027 See merge request !1094	2015-08-05 09:57:27 +00:00
Dmitriy Zaporozhets	c8d00787c2	Merge branch 'add-resend-confirm-email-admin-page' into 'master' ... Add "Confirm user" button to admin page ### What does this MR do? This MR adds a "Confirm user" to the admin user page. ### Why was this MR needed? There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state. Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set. ### Screenshot  ### What are the relevant issue numbers? * Closes #2116 * Closes https://github.com/gitlabhq/gitlabhq/issues/9502 See merge request !1067	2015-08-05 09:43:03 +00:00
Dmitriy Zaporozhets	46a84d8013	Merge branch 'rs-issue-2135' into 'master' ... Update docs for Ruby MRI 2.1 requirement Addresses #2135 See merge request !1089	2015-08-05 09:21:03 +00:00
Dmitriy Zaporozhets	734f97ae11	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-05 11:19:01 +02:00
Dmitriy Zaporozhets	7b4225bdb2	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-05 11:18:47 +02:00
Dmitriy Zaporozhets	6caa03d422	Merge remote-tracking branch 'public/project-buttons'	2015-08-05 11:18:28 +02:00
Valery Sizov	6353ca9ae8	Revert "Update noteable after a new note is added" ... This reverts commit fbdaf0e2a5.	2015-08-05 12:00:12 +03:00
Stan Hu	0c1ccda43f	Add "Confirm user" button in user admin page ... Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502	2015-08-05 00:35:53 -07:00
Robert Schilling	96bb42e5a7	Merge branch 'semaphore-shield' into 'master' ... Update the Semaphore badge to the shield badge type **Why is this needed?** It just does look better in the Readme :-) See merge request !1092	2015-08-05 07:04:00 +00:00
Jeroen van Baarsen	9076b5026b	Update the Semaphore badge to the shield badge type ... **Why is this needed?** It just does look better in the Readme :-) Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-08-05 08:07:35 +02:00
Achilleas Pipinellis	4c9ba632e9	Merge branch 'master' into 'master' ... updated restore docs wrt backup location [ci skip] Made sure to point out that the restore location can be overwritten by an entry in the config. See merge request !1030	2015-08-04 21:56:27 +00:00
Robert Speicher	f9d71c4b91	Update docs for Ruby MRI 2.1 requirement	2015-08-04 17:07:12 -04:00
Robert Speicher	e9bbea7048	Don't hide the clone holder for an empty project	2015-08-04 16:58:14 -04:00
Stan Hu	88a3cfe107	Merge branch 'rs-fix-rouge-inline-theme' into 'master' ... Fix the `inline_theme` option for the Rouge formatter See merge request !1083	2015-08-04 14:08:49 +00:00
Dmitriy Zaporozhets	326b827ce3	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-04 15:23:11 +02:00
Douwe Maan	58c76605b3	Merge branch 'update-mr-branch-text' into 'master' ... Update merge request text to reflect editability of source/target branch Screenshot 1 (source branch deleted):  Screenshot 2 (target branch deleted):  Closes #2134 See merge request !1085	2015-08-04 09:01:54 +00:00
Job van der Voort	e9ba1185f2	Merge branch 'add-user' into 'master' ... Added new doc about adding users and members Added new doc in workflow about how to add users and members and I also linked it to "permissions". See merge request !1916	2015-08-04 08:46:47 +00:00
karen Carias	c5a6c16dba	typo	2015-08-03 15:55:02 -07:00
karen Carias	28cc6d9b98	text fixed	2015-08-03 15:51:09 -07:00
Stan Hu	8221236df1	Update merge request text to reflect editability of source/target branch ... Closes #2134	2015-08-03 07:11:04 -07:00
Sytse Sijbrandij	8ec7025a5d	Link to admin raketask	2015-08-03 11:33:48 +00:00
Dmitriy Zaporozhets	cc4405db7d	Merge branch 'add-license'	2015-08-03 11:05:19 +02:00
Dmitriy Zaporozhets	c1c89500f3	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-03 11:04:20 +02:00
Dmitriy Zaporozhets	b118f648cb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-03 11:04:04 +02:00
Kamil Trzciński	0e994615a0	Merge branch 'redis-store' into 'master' ... Bump redis-store to 1.1.6 and remove redis-store-fix-expiry According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required /cc @jacobvosmaer @rspeicher See merge request !1081	2015-08-03 08:58:36 +00:00
Stan Hu	b8433cb886	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-02 12:53:08 -07:00
Stan Hu	ef707ebfac	Merge pull request #9520 from gipcompany/annotate-models-update ... Re-annotate models	2015-08-02 10:39:19 -07:00
Atsushi Ishida	f33898ecfb	Re-annotate models	2015-08-03 01:52:54 +09:00
Robert Speicher	fa5efea7f3	Fix the inline_theme option for the Rouge formatter	2015-08-01 19:10:14 -04:00
Douwe Maan	688ee3e4cb	Merge branch 'rs-code-links' into 'master' ... Make `code` elements in links display as such When a link consisted only of an inline code block -- ```[`like this`](https://google.com/)``` -- it was hard to tell that it was even a link. Before: >  After: >  See merge request !1082	2015-08-01 12:06:26 +00:00
Robert Speicher	1aa1f39248	Make code elements in links display as such ... Also adds some minor padding to inline `code` elements.	2015-07-31 17:44:16 -04:00
Robert Speicher	3f84c8a680	Merge branch 'api-useremails' into 'master' ... Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066	2015-07-31 20:40:51 +00:00
Douwe MaanandRobert Speicher	8802846565	Fix indentation	2015-07-31 16:39:51 -04:00
Job van der Voort	d2fffff0ec	Merge branch 'add-mr' into 'master' ... New doc about creating a Merge Request in GitLab Basics Added new doc about creating a new branch. See merge request !1917	2015-07-31 15:50:41 +00:00
karen Carias	e72e721f04	small changes	2015-07-31 08:21:53 -07:00
Kamil Trzcinski	87df06171e	Bump redis-store to 1.1.6 and remove redid-store-fix-expiry	2015-07-31 15:53:58 +02:00
Douwe Maan	bdb4288ab8	Merge branch 'mention-name-in-flash-msg' into 'master' ... Mention group and project names in flash messages upon create, update and delete. Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency. **Before**  **After**  See merge request !1070	2015-07-31 13:29:38 +00:00
Douwe Maan	3307008499	Merge branch 'admin-group-member' into 'master' ... Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059	2015-07-31 13:25:53 +00:00
Douwe Maan	7a048cf4bf	Merge branch 'fix-multiline-comment-highlighting' into 'master' ... Fix multi-line syntax highlighting ### What does this MR do? This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. ### Why was this MR needed? The current styling was broken for a while. ### Screenshots Before:  After:  ### What are the relevant issue numbers? Closes #1577 Closes #1495 See merge request !1079	2015-07-31 12:45:42 +00:00
Douwe Maan	51e5f379dd	Merge branch 'master' into api-useremails	2015-07-31 14:34:53 +02:00
Douwe Maan	f71d67dda1	Merge branch 'master' into add-license	2015-07-31 14:20:28 +02:00
Douwe Maan	0736f348a6	Use before_actions	2015-07-31 14:15:49 +02:00
Douwe Maan	be25f261ba	Merge branch 'master' into project-buttons	2015-07-31 14:12:08 +02:00
Douwe Maan	7ba7652019	Tweak project page buttons.	2015-07-31 13:56:15 +02:00
Stan Hu	0abe98f049	Fix multi-line syntax highlighting ... HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577	2015-07-30 22:37:53 -07:00
Robert Speicher	a51a3fb8ed	Merge branch 'rs-mr-1050-followup' into 'master' ... Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078	2015-07-31 01:47:41 +00:00
Robert Speicher	327013ace9	Merge branch 'rs-markdown-feature-pipelines' into 'master' ... Prepare Markdown feature spec for testing multiple pipelines This MR lays the groundwork for including or excluding certain HTML::Pipeline filters depending on what we're parsing. For example, excluding reference filters in the Issues and Merge Requests titles. See merge request !1053	2015-07-31 01:35:02 +00:00
Robert Speicher	a876db48d9	Merge branch 'api-new-attributes' into 'master' ... Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058	2015-07-30 21:38:48 +00:00
Robert Speicher	7ca7770e98	Fix CHANGELOG entry	2015-07-30 17:27:25 -04:00
Robert Speicher	4e22dcb6a3	Add spec to RelativeLinkFilter for Unicode filenames	2015-07-30 17:25:07 -04:00