4837 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	a6dfd065ca	Add atom feed for project activity.	2015-04-23 17:11:39 +02:00
Douwe Maan	72b090b890	Move activity feed buttons out of event_filter into actual show views.	2015-04-23 17:11:38 +02:00
Douwe Maan	cba86eed74	Add feed button to dashboard and group issue pages.	2015-04-23 17:11:38 +02:00
Douwe Maan	8917ae39e3	Add atom link tag to every page that has one.	2015-04-23 17:11:38 +02:00
Marin Jankovski	cc8de0e5e7	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-23 15:14:22 +02:00
Dmitriy Zaporozhets	ac4968b97e	Merge pull request #9062 from fgimian/omniauth-disable-turbolink ... Disable turbolinks for omniauth link to avoid rendering problems	2015-04-23 16:11:21 +03:00
Dmitriy Zaporozhets	f9119150ec	Merge branch 'rs-rails-env-predicates' into 'master' ... Fix two places where we should be using `Rails.env.development?` See merge request !550	2015-04-23 12:37:46 +00:00
Dmitriy Zaporozhets	71f6143552	Merge branch 'master' into new-sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb	2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets	63c5911961	Dont render dashbaord nav if user is not signed in ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-23 11:51:17 +03:00
Dmitriy Zaporozhets	5b6e702e31	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-22 22:59:24 +03:00
Dmitriy Zaporozhets	a22f3139f3	Merge branch 'rs-reply-hotkey' into 'master' ... "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775	2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets	28639a1971	For navless pages render dashboard nav ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-22 20:10:38 +03:00
Ioannis Kappas	3196c52969	added fieldset support to project and admin services views. ... split field logic to separate template.	2015-04-22 20:04:03 +03:00
Dmitriy Zaporozhets	0261a5e222	Fix wording and remove duplicate link	2015-04-22 18:18:11 +03:00
Dmitriy Zaporozhets	4a63573b21	Start applying new layout to snippets pages	2015-04-22 18:17:43 +03:00
Dmitriy Zaporozhets	27919e25e8	Add gitlab logo on login page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-22 18:02:29 +03:00
Dmitriy Zaporozhets	c41a5bf3cd	Restyle explore page to sidebar layout ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-22 17:28:44 +03:00
Dmitriy Zaporozhets	5647ce75b3	No need in empty head panel on login page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-22 16:54:39 +03:00
Dmitriy Zaporozhets	4860c4dc07	Fix toggle of sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-22 16:48:39 +03:00
Marin Jankovski	8d9c7305cd	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-22 11:17:09 +02:00
Jeroen van Baarsen	5e9d4a08a5	Merge pull request #9164 from dsander/fix-markdown-preview ... Make issue preview look like the result	2015-04-22 08:37:27 +02:00
Dominik Sander	34b976fd27	Make issue preview look like the result	2015-04-21 22:16:53 +02:00
Robert Speicher	3ceb888d79	Fix tab behavior on MergeRequests#new	2015-04-21 15:19:06 -04:00
Dmitriy Zaporozhets	6e6df3b830	Refactor themes for new UI ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-21 16:35:11 +03:00
Dmitriy Zaporozhets	d3059c7d29	New colorful design of sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-21 15:31:32 +03:00
Douwe Maan	1419e94816	Improve description of Google Code import user map.	2015-04-21 10:33:04 +02:00
Robert Speicher	6c3591279f	Fix two places where we should be using Rails.env.development?	2015-04-20 18:28:19 -04:00
Dmitriy Zaporozhets	76aade28e2	Merge pull request #9075 from Soullivaneuh/bootlint ... Bootlint integration	2015-04-20 16:03:43 +03:00
Dmitriy Zaporozhets	a4006a6b48	Merge branch 'better-commit-mentions' into 'master' ... Clean up code around commit mentions. Builds upon !527. See merge request !528	2015-04-20 12:42:31 +00:00
Ben Bodenmiller	47769bfd59	improve new project options ... * Simplify new repo commands * Include directions for how to add an existing folder that is either already a repo or not yet a repo Replaces #7918.	2015-04-20 03:13:39 -07:00
Dmitriy Zaporozhets	d012648b49	Merge branch 'fix-label-color-input' into 'master' ... Fix label color input. Because `value` was set, every label color would render as purple in the form. Introduced by 83b5a9ae2b between 7.9 and 7.10, so no changelog item. See merge request !538	2015-04-20 08:30:05 +00:00
Dmitriy Zaporozhets	41b45ece99	Merge branch 'rs-issue-2219' into 'master' ... Let Bootstrap's tab JS handle history Closes #2219 See merge request !1784	2015-04-19 16:30:26 +00:00
Dmitriy Zaporozhets	359f01c9e0	Merge branch 'rs-issue-2212' into 'master' ... Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765	2015-04-19 16:24:17 +00:00
Robert Speicher	4603bf500a	Add 'reply' hotkey to help modal	2015-04-18 15:17:26 -04:00
Robert Speicher	7d5fefb780	Fix 'merge_reuests' typo	2015-04-18 15:17:24 -04:00
Robert Speicher	269aee790c	Let Bootstrap's tab JS handle history ... Closes #2219	2015-04-17 16:42:38 -04:00
Douwe Maan	da89ebbe48	Fix label color input.	2015-04-17 17:38:31 +02:00
Dmitry Medvinsky	92544df8da	Fix auto-selection of URL field with X11 selection ... We use `focusin` event instead of `click` because when using the latter, when the selection is created it isn't put into X11 PRIMARY selection. And as a Linux user I'm very used to such behaviour that when something gets selected, it's ready for pasting, which is the primary purpose of the clone URL field. When `focusin` is used, the selection is copied to X11 buffer automatically, so it works as expected (tested in Firefox and Chrome).	2015-04-17 10:16:18 +03:00
Robert Speicher	3052e89420	Re-fix image rendering for help pages	2015-04-15 12:45:31 -04:00
Robert Speicher	ef47ea3d39	Revert "Fix and improve help rendering" ... This reverts commit d365004e68.	2015-04-15 12:24:44 -04:00
Dominik Sander	d4fec49abc	Fix merge request comments on files with multiple commits ... Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab	2015-04-15 18:23:57 +02:00
Douwe Maan	959ebbcade	Clean up code around commit mentions.	2015-04-15 17:57:31 +02:00
Dmitriy Zaporozhets	e3d818a4e8	Merge branch 'invitation' into 'master' ... Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.  Entering an email address that is not already a member will give you the option to invite them.  Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.  The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.  The invited user will receive an email with an "Accept invitation" link.  If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.  Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.  Accepting the invitation will redirect them to the group (or project) with an appropriate notice.  As currently, they will also receive this information by email.  At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.  The member row on the Members page will now have been updated with the new user account.  See merge request !500	2015-04-15 10:48:28 +00:00
Dmitriy Zaporozhets	b75866120b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 12:56:25 +03:00
Dmitriy Zaporozhets	3d9cbc5dcb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 12:44:59 +03:00
Dmitriy Zaporozhets	400c9c5ae2	Revert "Removed help link from sidebar" ... This reverts commit 6fe26e3e46.	2015-04-15 12:12:58 +03:00
Douwe Maan	63b21945d2	Merge branch 'google-code-import' into 'master' ... Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions  ### Imported issue  See merge request !471	2015-04-15 06:53:42 +00:00
Dmitriy Zaporozhets	0a0d6050fc	Merge pull request #8905 from jasonblanchard/remove-truncation-milestone ... Remove truncation from issue titles on milestone page	2015-04-15 09:22:46 +03:00
Douwe Maan	88c2639356	Remove superfluous info from invite accepted/declined mails.	2015-04-14 23:06:21 +02:00
Dmitriy Zaporozhets	09eea7ea84	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-14 18:13:38 +03:00