home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 82536f50a2 Merge pull request #8774 from tsigo/rs-testenv 
TestEnv improvements
 2015-02-17 22:09:10 -08:00
Dmitriy Zaporozhets d905a431e8 Merge branch 'affix-assignee' into 'master' 
Affix milestone/assignee UI element

See merge request !1536
 2015-02-18 05:42:24 +00:00
Dmitriy Zaporozhets 19eb86388a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-17 21:25:06 -08:00
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 0bd02e96a0 Merge pull request #8810 from m-a-r-c-o/unify-new-group-project-button 
Add new style to "New group" button
 2015-02-17 16:34:12 -08: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 896c046217 Affix assignee/milestone block 2015-02-17 16:14:49 -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
Douwe Maan 4036fb167d Change textarea upload hover icon from picture to paperclip. 2015-02-17 22:23:31 +01:00
Douwe Maan 99fb4d387f Add paperclip icon to links to uploads in notes. 2015-02-17 22:23:31 +01:00
Douwe Maan ab65be7a2f Use longer upload secret. 2015-02-17 22:23:31 +01:00
Douwe Maan ab401a6132 Remove note attachment file selector. 2015-02-17 22:23:31 +01:00
Douwe Maan d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00
Hannes RosenöggerandDouwe Maan 192e730662 Fix tests 2015-02-17 22:21:13 +01:00
Hannes RosenöggerandDouwe Maan 9729cc584f implement Project::UploadsController 2015-02-17 22:21:13 +01:00
Hannes RosenöggerandDouwe Maan ca504a77fe Fix tests 2015-02-17 22:20:44 +01:00
Hannes RosenöggerandDouwe Maan 9bf8480b4a Generalize the image upload in markdown 
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
 2015-02-17 22:20:44 +01: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
Marco Cyriacks 57e91940dd Add new style to "New group" button 
The new group button style was changed to have the same look as the new
project button (green background).
 2015-02-17 20:52:03 +01: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
Robert Speicher 7194810892 TestEnv improvements 
- Simplify cleaning the temporary testing path in TestEnv
- Don't run gitlab:shell:install if it's already installed
- Run git commands quietly
 2015-02-16 20:36:34 -05: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
Ewan Edwards 47e38e5c0e The "GitLab buttons in Gmail" document was not linked from anywhere 
else. It is now linked.
 2015-02-16 11:16:23 -08: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
Daniel Steinborn 880fb9eac0 fixed rake task to block removed ldap users 2015-02-16 10:00: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