home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Vinnie Okada e0f61a59b4 Use shorter map() syntax 2015-02-15 20:50:53 -07:00
Dmitriy Zaporozhets ec5622b1a4 Merge branch 'user-account-created-email' into 'master' 
Only send "Account was created for you" email when created by admin.

See #1985

cc @sytse

See merge request !1517
 2015-02-16 03:08:48 +00:00
Dmitriy Zaporozhets e0d7302b73 Merge branch 'subscription-link' into 'master' 
Add links to the quick help list

Add links in the quick help list to the pricing and feature comparison pages on about.gitlab.com.  See #1969

cc @sytse

See merge request !1525
 2015-02-16 03:07:47 +00:00
Dmitriy Zaporozhets 2ad00f5294 Merge branch 'tweet-new-project' 
Conflicts:
	db/schema.rb
 2015-02-15 19:03:10 -08:00
Vinnie Okada 9e0467c38e Fix application client count 
Display the number of unique users with an access token instead of the
total number of access tokens per application in the admin area.
 2015-02-15 15:53:33 -07:00
yglukhov 3d87cf8dc1 Make MR and issue numbers clickable links in MR and issue lists. 2015-02-15 21:01:43 +02:00
Vinnie Okada 1da7781cb3 Add items to "quick help" 
Modify the quick help list to add links to the pricing and feature
comparison pages of about.gitlab.com.
 2015-02-14 20:11:45 -07:00
Vinnie Okada 49d5099352 Avoid duplicate application rows 
Iterate over authorized applications instead of tokens to avoid multiple
rows for the same authorized app.
 2015-02-14 19:46:39 -07:00
Sytse Sijbrandij ee804e2d94 Better English in the performance diff message. 2015-02-14 12:13:31 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Douwe Maan 67afb5b145 Make sure twitter widgets are loaded when rendered through turbolinks. 2015-02-14 13:32:05 +01:00
Douwe Maan 9efb838be2 Change tweet text. 2015-02-14 13:31:46 +01:00
Aaron Stone 252ee4e7e5 Improve login screen when only OmniAuth providers are enabled 
Avoids an empty Sign in box when signup_enabled? is false, and avoids
showing "No authentication methods configured" unless there really are none.

OmniAuth signin gets its own file for consistency with signin and signup and LDAP.
 2015-02-13 23:49:12 -08:00
Dmitriy Zaporozhets f989190ed4 Show tooltips on collapsed sidebar 2015-02-13 13:36:59 -08:00
Dmitriy Zaporozhets f91767db3d Merge branch 'oauth-password-http' into 'master' 
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S)

See #1982.

![Screen Shot 2015-02-13 at 13.37.28](https://dev.gitlab.org/uploads/gitlab/gitlabhq/69fe527252/Screen_Shot_2015-02-13_at_13.37.28.png)

There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden.

cc @sytse

See merge request !1512
 2015-02-13 18:12:05 +00:00
Dmitriy Zaporozhets 4d9756c1e8 Merge branch 'username-namespace-clash' into 'master' 
Prevent autogenerated OAuth username to clash with existing namespace.

If the OAuth username already exists as a group rather than a user, automatic account creation would still fail.

See merge request !1511
 2015-02-13 18:08:53 +00:00
Dmitriy Zaporozhets c676856f1b Merge branch 'test_settings' into 'master' 
Test settings for issue tracker service

This adds minimum logging and response when using "test settings" button when the service is enabled.

See merge request !1506
 2015-02-13 17:59:03 +00:00
Dmitriy Zaporozhets b8cc501c3e Merge branch 'add_tracker_integration_doc' into 'master' 
Add tracker integration doc and help page on service

Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page.

See merge request !1508
 2015-02-13 17:57:39 +00:00
Dmitriy Zaporozhets 917ae13bf8 Merge branch 'signin-page-headings' into 'master' 
Add headings to signin/signup blocks on signin page.

See #1986

![Screen Shot 2015-02-13 at 15.17.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/4feb067a23/Screen_Shot_2015-02-13_at_15.17.34.png)

When signup is disabled, the heading for sign in only reads "Sign in", because there is no longer a choice of Existing/New user.

I've moved the OAuth signin options to just below the signin box because it looked odd as a separate box without a heading.

cc @sytse

See merge request !1516
 2015-02-13 17:43:17 +00:00
Dmitriy Zaporozhets 2f9661dcd3 Merge branch 'dashboard-new-project' into 'master' 
Add "New Project" button to dashboard projects page.

See merge request !1518
 2015-02-13 17:41:25 +00:00
Douwe Maan 055c2f1e33 Add "New Project" button to dashboard projects page. 2015-02-13 15:43:02 +01:00
Douwe Maan 4a62a0f01a Only send "Account was created for you" email when created by admin. 2015-02-13 15:30:54 +01:00
Douwe Maan 7c39e728ef Move OAuth signin options just below signin box. 2015-02-13 15:16:17 +01:00
Douwe Maan da1608196b Add headings to signin/signup blocks on signin page. 2015-02-13 15:16:00 +01:00
Douwe Maan 25e44d0530 Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S). 2015-02-13 14:44:42 +01:00
Douwe Maan 34cc4c5982 Link head panel titles to relevant root page. 2015-02-13 14:31:51 +01:00
Douwe Maan 161d15541a Prevent autogenerated OAuth username to clash with existing namespace. 2015-02-13 12:39:11 +01:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan 9b917b4a73 Add "User created project Namespace / Project" event 2015-02-13 12:02:58 +01:00
Douwe Maan 522efa43fe Refactor event title generation for more consistent messages. 
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
 2015-02-13 12:02:58 +01:00
Douwe Maan 07d05d2df7 Move all event creation to EventCreateService. 2015-02-13 12:02:58 +01:00
Marin Jankovski eccf695640 Explained in the integration documentation how to enable external issue tracker 2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets 2ff1b8e68d Merge branch 'clean-oauth-username' into 'master' 
Clean username acquired from OAuth/LDAP.

Fixes #1967.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813

See merge request !1500
 2015-02-13 00:39:34 +00:00
Dmitriy Zaporozhets f9880c11f7 Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-index 
Show assignees in the merge-requests index
 2015-02-12 14:46:41 -08:00
Marin Jankovski 8a37435738 Fix rubocop error. 2015-02-12 13:21:47 -08:00
Marin Jankovski 1a89db5ffb Try to test settings added in the service. 2015-02-12 13:02:58 -08:00
Sytse Sijbrandij e629c45d88 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-12 12:09:38 -08:00
Douwe Maan 6685661b54 Clean username acquired from OAuth/LDAP. 
Fixes #1967.
 2015-02-12 21:05:27 +01:00
Dmitriy Zaporozhets 714ca5189e Merge branch 'issues_tracker_template' into 'master' 
Issues trackers template

If admin defines service template, service in project will be prefilled with the template data.

See merge request !1503
 2015-02-12 20:02:23 +00:00
Marin Jankovski e8271226b1 Use the service_name. 2015-02-12 10:57:08 -08:00
Marin Jankovski 9f33898f7a All services can have templates. 2015-02-12 09:19:55 -08:00
Dmitriy Zaporozhets cab72628ff Merge branch 'master' into 'master' 
Adds new label color suggestions

This adds a bunch of label color suggestions

![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png)
![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png)

See merge request !289
 2015-02-12 07:17:46 +00:00
Kelvin Mutuma 783ecc9a2f Show Work In progress if a merge request is not assigned 2015-02-12 05:59:38 +03:00
Kelvin Mutuma e3ecdb4810 Show assignees in the merge-requests index 2015-02-12 05:41:47 +03:00
Marin Jankovski f7e9024535 Remove unecessary icon. 2015-02-11 18:36:40 -08:00
Marin Jankovski b3f944a398 Annotate services. Add a link to service template. 2015-02-11 18:29:24 -08:00
Marin Jankovski 6b4ddf2cc1 Add admin services templates. 2015-02-11 17:55:33 -08:00
Dmitriy Zaporozhets e71805db8a Merge branch 'ssh-link' into 'master' 
Fix link to SSH help page.

Closes #1981.

See merge request !1502
 2015-02-11 23:34:24 +00:00
Dmitriy Zaporozhets 36bbd5affb Merge branch 'mobile-maximum-scale-1' into 'master' 
Don't allow page to be scaled on mobile and add horizontal scrolling to code blocks

Closes #1974.

Previously, scaling (both automatically and manually) was enabled on mobile, which caused the top and sidebar to move over content. Scaling is now disabled.

Also previously, code in issues or comments too wide to fit inside the width of the window would "flow out" on the right, causing the whole page to become very wide and causing scrolling to scroll the entire page instead of just the code. Code blocks now scroll themselves.

See merge request !1501
 2015-02-11 22:08:22 +00:00
Dmitriy Zaporozhets d1ad5b5378 Merge branch 'fix-command-enter' into 'master' 
Actually submit comment on command-enter.

Resolves #1869.

Because !1474 didn't actually work.

cc @sytse

See merge request !1499
 2015-02-11 21:56:44 +00:00