home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,222 Commits 48 Branches 340 Tags
76e2564018a28f79817dfd7c1e83ab2fc0bb58bc
Commit Graph
10222 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 76e2564018 Recommend setup git 2.0 for installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:10:58 +03:00
Dmitriy Zaporozhets 04e8b5184f Merge branch 'check_ldap_filter' into 'master' 
Check LDAP user filter during sign-in
 2014-06-13 11:42:17 +00:00
Jacob Vosmaer 8761dd2a6f Check LDAP user filter during sign-in 2014-06-13 08:14:34 +02:00
Dmitriy Zaporozhets a5cbb4cb82 Merge branch 'autolink-in-project-description' into 'master' 
Autolink in project/group description

Group:

![Screenshot 2014-06-12 22.58.07](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/b5a95eff8a/Screenshot_2014-06-12_22.58.07.png)

Project:

![Screenshot 2014-06-12 22.58.36](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/51e516fb41/Screenshot_2014-06-12_22.58.36.png)

- - -

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4110570-group-description-should-support-markdown
 2014-06-13 05:54:40 +00:00
Dmitriy Zaporozhets afe47e26f5 Add autolink to project/group description render 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:58:59 +03:00
Dmitriy Zaporozhets 92ccc687b0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-12 22:39:31 +03:00
Dmitriy Zaporozhets 6c6cdd23ff Prevent timeout for Commits#stats page for huge repos 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:24:19 +03:00
Dmitriy Zaporozhets 5d9feb60c3 Merge pull request #7123 from skv-headless/fix_double_check_all_issues 
fix double check for all issues
 2014-06-12 22:10:23 +03:00
Dmitriy Zaporozhets 1bde927750 Restyle git tags page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:08:54 +03:00
Dmitriy Zaporozhets 98416ec9ab Show proper message for new MR when satellite fails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:45 +03:00
Dmitriy Zaporozhets c827af21d3 Remove unnecessary padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:02 +03:00
skv-headless 1f3a69c1d1 fix double check for all issues 2014-06-12 22:39:08 +04:00
Dmitriy Zaporozhets 11728851bf Fix blob highlight tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:36:38 +03:00
Dmitriy Zaporozhets 86fa074024 Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-12 18:22:39 +00:00
Dmitriy Zaporozhets 988ac03b89 Merge branch 'careful_sidekiq_kill' into 'master' 
Be more selective when killing stray Sidekiqs
 2014-06-12 18:22:10 +00:00
Jacob Vosmaer 8e2752f459 Be more selective when killing stray Sidekiqs 
Avoid the background_jobs script killing every process with 'sidekiq' in
its argument string (e.g. 'rake gitlab:sidekiq start') by also catching
the number (2) in 'sidekiq 2.14'.
 2014-06-12 15:32:47 +02:00
Dmitriy Zaporozhets 6e2a75df8e Dont truncate project names on group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 16:16:29 +03:00
Dmitriy Zaporozhets 11e1c01341 Merge branch 'detect_omnibus' into 'master' 
Detect omnibus-gitlab in `rake gitlab:check`
 2014-06-12 10:25:57 +00:00
Dmitriy Zaporozhets 630be84add Merge branch 'files-rational-git-log' into 'master' 
Split commit logs loading

#### Before this MR

When visit files tab we have ajax call that loads all last commits for files inside directory.
Load time depends on amount of files in directory. So if directory has 100 files - you may need to wait up to 20 seconds to get last commits info of files. Still if you do navigation at this time the request still wait for processing taking workers busy. If several people try to navigate through big repository directories - you will see huge performance drop.

#### After this MR

Load last commits only for first 10 entries. It usually takes not more then a second (even for huge repos). If user still on the same page - do next ajax call and get 10 more entries. If user navigate to another directory - stop ajax calls for this directory. So for cases when you want navigate to nested directory - you don't have long-running ajax calls that takes workers and makes app unusable for other users

- - -

Fixes #1229
 2014-06-12 10:24:58 +00:00
Dmitriy Zaporozhets fcb0b76c32 Load last commit for files per 10 items. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 12:01:54 +03:00
Jacob Vosmaer 90bfe286a6 Skip init script checks on omnibus-gitlab 
Omnibus-gitlab does not use the init script.
 2014-06-12 09:31:17 +02:00
Dmitriy Zaporozhets 9fd6c3d591 Merge branch 'huge-repo-improve' into 'master' 
Better support for huge repositories

This MR contains next improvements to GitLab:
* You can see repo commits count even if it is > 100k commits
* Prevent 500 for commit page for large repos
* Add notice about huge push over http to unicorn config
* File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
* Show spinner when loading data for network graph
 2014-06-11 21:09:23 +00:00
Dmitriy Zaporozhets 61c2a2d39a More items in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:43:05 +03:00
Dmitriy Zaporozhets 56f0f6aba3 Use same 30 seconds satellite timeout for all actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:37:21 +03:00
Dmitriy Zaporozhets 7ed935b676 Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:13:31 +03:00
Dmitriy Zaporozhets 5b2193555b Describe unicorn timeout value in git over http 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:53:42 +03:00
Dmitriy Zaporozhets afa4a075e4 Show spinner on network graph while it loading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:22:58 +03:00
Dmitriy Zaporozhets e740a00ed6 Prevent commit page error if cant collect branches where commit exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:08:39 +03:00
Dmitriy Zaporozhets 7edbee6c18 Merge branch 'strip_apostrophe_from_email_generated_username' into 'master' 
Strip apostrophe from email generated username

Related to #1225
Fixes #1225
 2014-06-11 18:59:26 +00:00
Dmitriy Zaporozhets 4b6c93c127 Merge branch 'bump-gitlab-git' into 'master' 
Bump gitlab git

Makes Commit#find method much faster on bigger repos.

Partly fixes #1306
 2014-06-11 18:41:39 +00:00
Dmitriy Zaporozhets 4594ca8886 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 19:13:05 +03:00
Dmitriy Zaporozhets b27705ce4b Merge branch 'bump-grit' into 'master' 
Bump grit

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
 2014-06-11 16:10:56 +00:00
Marin Jankovski 314e4736e4 Strip apostrophe from email generated usernames. 2014-06-11 17:06:28 +02:00
Dmitriy Zaporozhets d1f3643cbc Merge branch 'sort-milestone-merge-requests' into 'master' 
Sort milestone merge requests

Part of #1207
 2014-06-11 14:53:12 +00:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets f2db4a18b9 Bump gitlab-grit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 16:39:55 +03:00
Dmitriy Zaporozhets 1d7735773e Merge branch 'email_with_apostrophe' into 'master' 
Email with apostrophe

Fixes #1225
 2014-06-11 12:15:01 +00:00
Dmitriy Zaporozhets ed610043a8 Merge branch 'milestone-issue-position' into 'master' 
Milestone issues sorting

Now issues save sort position inside milestone lists

Part of #1207
 2014-06-11 12:14:44 +00:00
Dmitriy Zaporozhets 5117bf6f53 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-11 15:03:02 +03:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard 
links to issues on main dashboard
 2014-06-11 15:02:48 +03:00
Marin Jankovski f43e41973f Test for the apostrophe in the email 2014-06-11 13:36:30 +02:00
Dmitriy Zaporozhets f82d0d8d58 Merge pull request #6940 from skv-headless/mr-diff-note-scroll-fix 
fix link to notes in merge request diff
 2014-06-11 14:25:19 +03:00
Dmitriy Zaporozhets bf941ce9ac Merge pull request #7012 from MrMarvin/issue_229_no_avatar_png_path_in_coffee 
fixes gitlab.com issue #229 - github.com issue #6976
 2014-06-11 14:21:59 +03:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 14:09:45 +03:00
Marin Jankovski e57fdc1190 Remove email_validator gem and allow apostrophe as a valid character in email. 2014-06-11 13:04:30 +02:00
Dmitriy Zaporozhets 4473013359 Merge branch 'master-release-clarification' into 'master' 
Master release clarification
 2014-06-11 09:27:39 +00:00
Sytse Sijbrandij d2d99521b6 Clarify the master branch release instructions. 2014-06-11 10:37:48 +02:00
Marvin Frick 587502390b fixes gitlab.com issue #229 
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
 2014-06-10 22:28:11 +02:00
Dmitriy Zaporozhets 1f5891e991 Use more compact bordered-list for commits page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 22:01:56 +03:00
Dmitriy Zaporozhets 8aac4fadba Small ui fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 21:57:05 +03:00