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
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schilling 3a246fbd38 Update org-ruby 2014-08-13 15:45:48 +02:00
Alexander MillsandAlexander Mills d3f5a0c67f set the collation to utf8_general_ci 
I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci

set the collation to utf8_general_ci

I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci

set the collation to utf8_general_ci

I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci
 2014-08-13 14:45:23 +01: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
Robert Schilling bb54784c08 Update gemnasium-gitlab-service 2014-08-13 15:42:54 +02: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
Dmitriy Zaporozhets aaa2bbd790 Update cahngelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 21:39:02 +03:00
Dmitriy Zaporozhets 43619db515 Merge branch 'increase-import-timeout' into 'master' 
Increase import timeout

Increase import timeout from 2 to 4 minutes. It allows repositories like `gitlabhq` be imported via UI

See merge request !1013
 2014-08-11 18:38:02 +00:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 20:58:39 +03:00
Dmitriy Zaporozhets 2c77dae2d7 Merge branch 'improve-dev-seeds' into 'master' 
Improve dev seeds

See merge request !1012
 2014-08-11 17:24:41 +00:00
Dmitriy Zaporozhets 2804902cfc Improve developer seeds 
* Improt projects inline so after seeds you have repos
* Fix merge request seeds
* Add comment seeds to both issues and merge requests
* Remove some projects from seeds to increase speed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 17:55:31 +03:00
Dmitriy Zaporozhets 3cc2c6ef79 Remove outdated seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 16:01:07 +03:00
Dmitriy Zaporozhets f8eedb4cda Cleaner variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 15:25:25 +03:00
Dmitriy Zaporozhets 80036470c3 more changelog entries 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 13:31:58 +03:00
Dmitriy Zaporozhets 80f8cb2f88 Merge branch 'fix_markup_encoding' into 'master' 
Fix encoding of output of markup, prevent 500 for non-ascii characters

#### What does this MR do?

This MR forces the output of `Github::markup` to have the same encoding as the input to it.

#### Why was this MR needed?

This prevents 500 errors if the markup contains non-asci characters.

#### What are the relevant issue numbers / Feature requests?

This MR closes

* #296
* https://github.com/gitlabhq/gitlabhq/issues/7023

/cc @jacobvosmaer

See merge request !160
 2014-08-11 10:20:34 +00:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Dmitriy Zaporozhets e794b56133 Merge pull request #7463 from Razer6/improve/travis 
Add retry option of travis and bundler
 2014-08-11 13:11:26 +03:00
Dmitriy Zaporozhets 9238616d6f Merge pull request #7468 from Razer6/fix_wrong_compare_message 
Turn if/else branch for valid compare error message
 2014-08-11 13:11:00 +03:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling 
Improve readme markup,  fixes #7455
 2014-08-11 13:02:24 +03:00
Dmitriy Zaporozhets ddd238eff8 Revert "history for files follows after rename" 
This reverts commit a547356133.
Because grit does not respect offset setting when follow: true which
cause invalid commit history for file
 2014-08-11 13:00:37 +03:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00