home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
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 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 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 9f4613bb86 Fix projects ending with _git or -git being ignored by post-receive hook 2014-08-13 07:24:50 +00:00
Ciro Santilli 52d0ae32b0 Restrict commit area resize to vertical. 2014-08-12 20:41:28 +02: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 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
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 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
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02: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
Dmitriy Zaporozhets d3067379a4 Fix project search showing always no results if no merge requests matches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 12:48:00 +03:00
Dmitriy Zaporozhets bdb9340e4d Merge pull request #7385 from Razer6/fix_search_empty_project 
Fix 500 on searching on empty project, restyle search page
 2014-08-11 12:41:58 +03:00
Dmitriy Zaporozhets 7122a823f8 Merge pull request #7393 from Razer6/fix_500_hook_service_down 
Prevent 500 if hook url is down when testing a hook, fixes #7376
 2014-08-11 12:41:35 +03:00
Dmitriy Zaporozhets 42d4ed3a40 Merge pull request #7417 from woita/follow-history-for-files 
history for files follows after rename
 2014-08-11 12:41:00 +03:00
Dmitriy Zaporozhets 91d6f916c7 Merge pull request #7432 from Razer6/disable_comment_btn_if_empty 
Disable 'Save changes' button if input is empty, fixes #6351
 2014-08-11 12:40:48 +03:00
Robert Schilling f361be9eca Restyle search page 
Use ruby 1.9 syntax
 2014-08-11 11:34:45 +02:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500 
Fix hound
 2014-08-11 11:31:37 +02:00
Dmitriy Zaporozhets 04d1128b8a Merge branch 'less-chatty-hipchat-intergation' into 'master' 
Less chatty HipChat intergation

The HipChat integration is noisy. In our team it constantly overwhelms the channel with a lot of commits or the bodies of their messages. It's very easy to loose the actual conversation in the midst of this.

This request does two things:

* Limit the number of shown commits on every push
* Display only the first line (the subject) of each commit messages

We tried it and found it was nicer for us 😄

See merge request !159
 2014-08-11 09:29:40 +00:00
Robert Schilling 13c17ed494 Turn if/else branch vor valid compare error message 2014-08-11 09:41:05 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Robert Schilling 0e3f8ea2ef Use simple_format if we don't have a proper renderer 2014-08-10 14:33:22 +02:00
Robert Schilling 2fd30cc57f Rescue if markup fails, fixes #7455 2014-08-10 13:25:35 +02:00
Dmitriy Zaporozhets e09ef2fc38 Merge branch 'improve-test-env' into 'master' 
Improve test env

* Replace big gitlabhq repo with small one (https://gitlab.com/gitlab-org/gitlab-test)
* dont stub gitlab-shell calls

Advantages:

* test gitlab-shell install during tests
* test integration with gitlab-shell features (fork, change default branch etc)
* don't store archive with test repo inside gitlab
* less stubs - easier to write/read tests

During this refactoring __next issues are be fixed__:

* satellite error if gitlab_shell path is relative
* project rename repo -> 500 error
* fixed wrong diff for MR `download plain diff`
* fixed bug when gfm ignores `@ref` variable during link parsing

Fixes #1451

See merge request !1005
 2014-08-09 17:51:31 +00:00
Jacob Vosmaer c0e1312567 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-07 17:19:23 +02:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Sytse Sijbrandij 43f560b174 Add comments. 2014-08-06 17:44:57 +02:00
Jacob Vosmaer 11d5ad2f17 Make file edit error message less specific 
The truth is that at the point where there error message is written we
can only guess what went wrong.
 2014-08-06 14:27:22 +02:00
Dmitriy Zaporozhets e1f141ac1a gfm should respect @ref value when build relative links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 12:14:53 +03:00
Ben Bodenmiller 66f8a44fd3 make bullet punctuation consistent 2014-08-04 20:51:26 -07:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00
Robert Schilling 2cb7bf713e Rtrim input before checking if form is empty 2014-08-04 10:06:53 +02:00
Robert Schilling 010ba5ec22 Remove duplicated setupNoteForm method 2014-08-04 09:55:57 +02:00
Walter Kreilinger a547356133 history for files follows after rename 2014-08-02 03:54:39 +02:00
Dmitriy Zaporozhets 2a6fc1c5de Repository#path_to_repo should always return absolute path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 20:12:49 +03:00
Rob Taylor e8e2de0731 Removed redundant spans 2014-07-31 17:03:47 +01:00
Rob Taylor 9661070e26 Moved padding from li to a in dashboard groups / projects listing 2014-07-31 15:04:08 +01:00
Dmitriy Zaporozhets 43d570e0ce Fix 500 error when rename repository. Fixes #1473 2014-07-31 15:39:28 +03:00
Dmitriy Zaporozhets 0f4748873d Project labels tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets 3ed2fce208 Style label-branch color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 23:04:47 +03:00
Dmitriy Zaporozhets dab9835ae1 Use label-branch css for MR branches info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 22:58:20 +03:00