home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,041 Commits 48 Branches 340 Tags
652de6f5912deb828cdd666a8a390b06ddd1abbd
Commit Graph
11041 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeroen van Baarsen 652de6f591 Enable highlighting for blame 
Fixes #3675

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-08-25 11:11:57 +02:00
Dmitriy Zaporozhets cb33279a0f Merge branch 'label-permissions' into 'master' 
Label permissions

* Update label permission docs
* Add authorisation to labels via API

See merge request !1020
 2014-08-15 12:25:34 +00:00
Dmitriy Zaporozhets a8d1cbbecc Merge branch 'git_max_size' into 'master' 
Use new git max_size in the settings initializer

This allows us to avoid repeating default max_size setting in the omnibus-gitlab repository.

See merge request !1021
 2014-08-15 10:07:29 +00:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02:00
Dmitriy Zaporozhets 6063a1e6c1 Add labels api authorization. Update permission doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 11:59:19 +03:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 014eff5d8f Merge pull request #7499 from skv-headless/fix-commit-msg 
Fix commit msg
 2014-08-15 10:23:45 +03:00
Dmitriy Zaporozhets 0602c5d027 Change default label color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 10:20:12 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
Dmitriy Zaporozhets 7120af7251 Merge pull request #7281 from skv-headless/diff-unfold 
unfold commits
 2014-08-15 09:34:12 +03:00
Dmitriy Zaporozhets 45da59daab Mention username option for developers in gitlab.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-14 15:15:48 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
skv fe46500448 gfm and preserve commit message 
for commits#show
 2014-08-14 15:20:34 +04:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:47:03 +03:00
Dmitriy Zaporozhets d8b769ec74 Make default sing-in logo smaller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:36:00 +03:00
Jeroen van Baarsen 2653ca6ee1 Merge pull request #7494 from Razer6/add_7_1_1_changelog 
Add 7.1.1 patch release changelog
 2014-08-13 17:09:58 +02:00
Dmitriy ZaporozhetsandRobert Schilling ea177b33b3 Add patch release changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-13 17:06:23 +02:00
Jeroen van Baarsen 8bce9d7fed Merge pull request #7475 from bbodenmiller/curl-redirects 
follow curl redirects
 2014-08-13 16:19:57 +02:00
Robert Schilling 04ad197bcc Trigger an update of save button if user pressed a preview color 2014-08-13 15:48:26 +02:00
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Robert Schilling c9eaa46c73 Labels need to be valid on name 2014-08-13 15:48:26 +02:00
Robert Schilling a3c969cd92 Add testcase for invalid color 2014-08-13 15:48:26 +02:00
Robert Schilling 6085b6a765 Move label coffeescript from view to class 2014-08-13 15:48:26 +02:00
Robert Schilling 0b5e0e4c55 Disable label submit button if any field is empty 2014-08-13 15:48:26 +02:00
Dmitriy Zaporozhets 71f87ffb66 Merge pull request #6788 from CingleVue/master 
Patched `MergeRequest` to return more data.
 2014-08-13 16:47:51 +03:00
Dmitriy Zaporozhets 32de669159 Merge pull request #7189 from skv-headless/fix_duplicate_event_loading 
prevent events duplication loading
 2014-08-13 16:46:00 +03:00
Dmitriy Zaporozhets e24589a165 Merge pull request #7308 from Azaret/fix_milestone_description_max_length 
Fix milestones description's max length
 2014-08-13 16:43:04 +03:00
Dmitriy Zaporozhets 82c8c44cac Merge pull request #7312 from hiroponz/fix-404-when-clicking-link-on-hipchat-message 
Fix 404 error when clicking the branch link on hipchat message
 2014-08-13 16:42:31 +03:00
Dmitriy Zaporozhets 3c046cc4e7 Merge pull request #7426 from Razer6/rtrim_note_input 
rtrim() input before checking if note form is empty
 2014-08-13 16:41:08 +03:00
Dmitriy Zaporozhets dbb1cb30a3 Merge pull request #7441 from bbodenmiller/patch-7 
add git config --global core.autocrlf check
 2014-08-13 16:39:58 +03:00
Dmitriy Zaporozhets 9f3a597092 Merge pull request #7483 from cirosantilli/commit-area-resize-vertical 
Restrict commit area resize to vertical.
 2014-08-13 16:39:12 +03:00
Dmitriy Zaporozhets 7e0bd5df28 Merge branch 'bump_gitlab_git' into 'master' 
Bump gitlab git

Fixes #1394

See merge request !1015
 2014-08-13 13:29:38 +00:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Dmitriy Zaporozhets 67c5d381a9 Merge branch 'dont-ignore-git-projects' into 'master' 
Fix post-receive worker for some projects

If project ends with `-git` or `_git` or any kind of `git` - it get ignored by post-receive worker

See merge request !1018
 2014-08-13 08:35:47 +00:00
Dmitriy Zaporozhets 9f4613bb86 Fix projects ending with _git or -git being ignored by post-receive hook 2014-08-13 07:24:50 +00:00
Dmitriy Zaporozhets ad6d14a1b1 Update gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 10:16:00 +03:00
Dmitriy Zaporozhets aa3d3451c0 Merge branch 'issue-disable-debug-assets' into 'master' 
Issue disable debug assets

Improve development speed. Concats all javascript into on file / HTTP request.

See merge request !1017
 2014-08-13 06:13:07 +00:00
Ciro Santilli 52d0ae32b0 Restrict commit area resize to vertical. 2014-08-12 20:41:28 +02:00
Jan-Willem van der Meer 88773498b9 Disable debug assets 
It's good for debugging javacsript, but creates massive amounts of http request
by adding each javascript individually. Only turn it on while debugging js code.
 2014-08-12 18:10:16 +02:00
Dmitriy Zaporozhets e642cbe0fa Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-12 16:41:25 +03:00
Dmitriy Zaporozhets 53ead2e35c Merge branch 'more-email-threading' into 'master' 
Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231dbed)

See merge request !145
 2014-08-12 12:28:19 +00:00
Dmitriy Zaporozhets 3d99622c2d Merge branch 'mr-accept-widget' into 'master' 
Improve MR accept widget

* fixes UX problem with 2 confusing `click here` links.
* separate Accept MR block from manual merge instructions

See merge request !1014
 2014-08-12 12:27:18 +00:00
Dmitriy Zaporozhets 423390a2c7 Separate accept MR settings from manual merge instructions. Remove confusing click here links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-12 11:48:58 +03:00
Ben Bodenmiller aabb4093b7 follow curl redirects 
Update `curl` commands to follow redirects (see
http://curl.haxx.se/docs/manpage.html#-L). Current `curl` commands will
return unexpected results if the requested content has been moved and is
returning information about where it has been moved to. Including the
`-L` option tells `curl` to follow the redirect so the file can be
correctly acquired.
 2014-08-11 22:01:37 -07:00