home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,071 Commits 48 Branches 340 Tags
ee804e2d94018f633c6e400b443ef514b5d7a10f
Commit Graph
14071 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij ee804e2d94 Better English in the performance diff message. 2015-02-14 12:13:31 -08:00
Sytse Sijbrandij 5725b6daad Merge branch 'update_omniauth_integration_document' into 'master' 
Update omniauth integration documentation

See merge request !1522
 2015-02-13 23:38:50 +00:00
Dmitriy Zaporozhets d785b20c43 Merge branch 'sidebar-tooltips' into 'master' 
Sidebar tooltips

Show nice tooltips when hover on collapsed sidebar

See merge request !1521
 2015-02-13 22:52:09 +00:00
Marin Jankovski d76c5824bc Update oauth documenatation with examples for omnibus package and installations from source. 2015-02-13 14:49:19 -08:00
Dmitriy Zaporozhets f989190ed4 Show tooltips on collapsed sidebar 2015-02-13 13:36:59 -08:00
Dmitriy Zaporozhets d0f045eb86 Merge branch 'improve_doc' into 'master' 
Gitlab.com importer: Doc && screenshots

See merge request !1520
 2015-02-13 18:35:15 +00:00
Valery Sizov 78124d9783 GitLab.com importer: documentation 2015-02-13 20:19:16 +02: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 6d523db7f6 Merge branch 'log_doc' into 'master' 
Log documentation

See merge request !1513
 2015-02-13 18:06:56 +00:00
Dmitriy Zaporozhets 1b81b29431 Merge branch 'oauth2_doc' into 'master' 
Oauth2 provider doc

See merge request !1519
 2015-02-13 18:00:57 +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
Dmitriy Zaporozhets 72ae15a9d2 Merge branch 'head-panel-link' into 'master' 
Link head panel titles to relevant root page.

I found myself trying to click "GitLab" in the head panel when on the group milestones page.

See merge request !1515
 2015-02-13 17:40:31 +00:00
Valery Sizov d9b32f20c6 OAuth2 provider documentation 2015-02-13 19:27:50 +02:00
Marin Jankovski 7474b1b03f Add assignees in mr page to the CHANGELOG. 2015-02-13 09:15:08 -08:00
Marin Jankovski 01c6806f80 Text changes recommended by Job. 2015-02-13 08:56:25 -08:00
Douwe Maan 055c2f1e33 Add "New Project" button to dashboard projects page. 2015-02-13 15:43:02 +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
Valery Sizov 25ff20677e log documentation 2015-02-13 15:05:37 +02:00
Douwe Maan 161d15541a Prevent autogenerated OAuth username to clash with existing namespace. 2015-02-13 12:39:11 +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 529188e478 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 16:47:52 -08:00
Dmitriy Zaporozhets 1343b2dfac Merge pull request #8785 from jvanbaarsen/rspec-upgrade 
Rspec upgrade
 2015-02-12 16:47:06 -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
Dmitriy Zaporozhets 1d9e9c1b92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-12 14:43:28 -08:00
Dmitriy Zaporozhets 2be3a012ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 14:43:02 -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
Jeroen van Baarsen 6860004466 Fixed deprecation in spinach stubs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:22:23 +01:00
Sytse Sijbrandij e629c45d88 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-12 12:09:38 -08:00
Sytse Sijbrandij d899bc914f Merge branch 'gitattributes-merge-union' into 'master' 
Use gitattribute merge=union to reduce CHANGELOG merge conflicts.

See gitlab/organization#137.

Tested and found working!

@sytse How would you like to address this in [the article](https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/)? Simply replace "Thanks ayufan, we'll try this instead." by "Thanks ayufan, we've implemented this instead."?

See merge request !1505
 2015-02-12 20:05:36 +00: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
Jeroen van Baarsen 026e988544 Even more hound fixes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:00:55 +01:00
Douwe Maan 4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
Marin Jankovski e8271226b1 Use the service_name. 2015-02-12 10:57:08 -08:00
Marin Jankovski 378520bd8b Add a test for service template. 2015-02-12 10:53:01 -08:00
Jeroen van Baarsen 5bb743efec Fixed tests for spinach 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:48:42 +01:00
Jeroen van Baarsen 940a402b6e Fixed hound warnings 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:32:58 +01:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Marin Jankovski 9f33898f7a All services can have templates. 2015-02-12 09:19:55 -08:00
Jeroen van Baarsen de1c450abd Started on the rspec upgrade 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 16:48:53 +01:00
Jeroen van Baarsen d9f84f6867 Merge pull request #8445 from jvanbaarsen/project-spec-speed-up 
requests/api/project_spec.rb speed up
 2015-02-12 11:26:09 +01:00