home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,122 Commits 48 Branches 340 Tags
fe2b98ab0bee618aa2af25f5fed53780997d9cd2
Commit Graph
14122 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets fe2b98ab0b Merge branch 'remove-group-id' into 'master' 
Remove Group#owner_id from API

For #1943

See merge request !1537
 2015-02-18 01:42:47 +00:00
Dmitriy Zaporozhets 000865f138 Merge branch 'gitlab-com-import' into 'master' 
Hide Gitlab.com import for GitLab.com

See merge request !1538
 2015-02-18 01:41:05 +00:00
Dmitriy Zaporozhets ff492307b9 Dont show gitlab.com import for gitlab.com :) 2015-02-17 16:27:40 -08:00
Dmitriy Zaporozhets 24d939afb9 Remove Group#owner_id from API since it is not used any more 2015-02-17 16:23:44 -08:00
Dmitriy Zaporozhets 417975ae2f Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab shell

See merge request !1535
 2015-02-17 22:43:16 +00:00
Dmitriy Zaporozhets c3e05fc321 Bump gitlab-shell version 2015-02-17 13:15:29 -08:00
Dmitriy Zaporozhets 0da0d800f2 Merge branch 'md-preview-class' into 'master' 
Make sure Markdown previews always use the same styling as the eventual destination.

Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.

See merge request !1514
 2015-02-17 20:38:53 +00:00
Dmitriy Zaporozhets 55a906f643 Merge branch 'fix_access_control_notes' into 'master' 
Fix broken access control for note attachments

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger.

See merge request !1528
 2015-02-17 18:05:12 +00:00
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Dmitriy Zaporozhets 112db32f19 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-17 01:23:33 -08:00
Dmitriy Zaporozhets 2b5298e51e Merge branch 'hl-bugfix' into 'master' 
Highlight bugfix

Fixes:

* snippet rendering bug #2011
* dev fixtures has invalid root user

See merge request !1532
 2015-02-17 09:23:25 +00:00
Dmitriy Zaporozhets 2c893cb380 Fix dev fixture for admin 2015-02-17 00:23:09 -08:00
Dmitriy Zaporozhets 3df135a66c Fix code rendering for snippets 2015-02-17 00:16:58 -08:00
Dmitriy Zaporozhets 904c382f6a Fix code rendering for snippets 2015-02-17 00:16:28 -08:00
Marin Jankovski b6a678ef43 Use correct shell version in update doc. 2015-02-16 20:27:58 -08:00
Marin Jankovski 317e8cfee0 Merge branch 'update-guides-7-8' into 'master' 
Updated guides for 7.8

Updated guides fro the 7.8 release

Fixes #2009

See merge request !1531
 2015-02-17 04:18:12 +00:00
Patricio Cano d11c64a67f Updated the installation and update guides 2015-02-16 17:51:29 -08:00
Dmitriy Zaporozhets eceec9b1c5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-16 15:09:17 -08:00
Dmitriy Zaporozhets 9eef14279f Merge branch 'oauth-dup' into 'master' 
Fix duplicate authorized applications

On the profile applications page, display one row per authorized app instead of one row per access token.  See #1987.

cc @sytse

See merge request !1524
 2015-02-16 23:08:50 +00:00
Dmitriy Zaporozhets 9a575522d5 Merge branch 'issue-title-css' into 'master' 
Remove top margin for issue/mr title

See merge request !1529
 2015-02-16 22:16:35 +00:00
Dmitriy Zaporozhets e38f50f0ed Merge branch 'fix-double-note-submit' into 'master' 
Fix double note submit

Closes #1989.

See merge request !1527
 2015-02-16 21:07:03 +00:00
Douwe Maan ebd39fc082 Nitpicking. 2015-02-16 20:10:15 +01:00
Hannes RosenöggerandDouwe Maan 7d5f86f6cb Fix broken access control and refactor avatar upload 
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
 2015-02-16 20:10:15 +01:00
Dmitriy Zaporozhets b0a9dbdfb1 Remove top margin for issue/mr title 2015-02-16 10:14:07 -08:00
Douwe Maan 29a997cde9 Properly clear notes bindings to prevent double comments on Ctrl-Enter. 2015-02-16 18:25:57 +01:00
Job van der Voort 6fa752a8ae Merge branch 'manual_to_source_wording' into 'master' 
Rephrasing in documentation for manual installs

Rephrased the wording in the documentation to say "installation from source" or similar.

/cc @sytse

See merge request !1526
 2015-02-16 17:14:04 +00:00
Patricio Cano 2df8a91c82 Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar. 2015-02-16 09:10:07 -08:00
Robert Schilling 5ec8038984 Merge pull request #8805 from mavimo/patch-1 
Fix typo in changelog
 2015-02-16 10:31:25 +01:00
Marco Vito Moscaritolo 958eaba3d9 Fix typo in changelog 
Fixed small typo in changelog file.
 2015-02-16 09:48:32 +01:00
Sytse Sijbrandij 87b4135924 Subscription should be a link on its own. 2015-02-15 21:51:23 -08:00
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
Dmitriy Zaporozhets 26d594f2dd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-15 19:00:53 -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
Robert Schilling 01d86d33a1 Merge pull request #8801 from Senorsen/patch-1 
Fix wrong word in document of google oauth
 2015-02-15 20:48:21 +01:00
Zhang Sen ebd00cc7f0 Fix wrong word in document of google oauth 2015-02-15 18:24:00 +08:00
Vinnie Okada 020ec31eb5 Update CHANGELOG 2015-02-14 20:47:57 -07:00
Vinnie Okada 655e9c6b42 Update CHANGELOG 2015-02-14 20:45:16 -07: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
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
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