summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable CentOS packaging.Cyril Rohr2014-06-141-0/+7
|
* Improve MR message for huge diffsDmitriy Zaporozhets2014-06-142-1/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge remote-tracking branch 'origin/issue_closing_widget'Dmitriy Zaporozhets2014-06-145-14/+29
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Detect closing issues in Merge Request descriptionJacob Vosmaer2014-06-135-14/+29
| |
* | Merge branch 'ce_issues_sentence' into 'master'Dmitriy Zaporozhets2014-06-143-1/+17
|\ \ | | | | | | | | | | | | | | | Issues sentence helper This will make merging CE into EE later easier.
| * | Add a test for issue sentence generationJacob Vosmaer2014-06-133-1/+17
| | |
* | | Merge branch 'more-secure-api' into 'master'Dmitriy Zaporozhets2014-06-1417-64/+161
|\ \ \ | |/ / |/| | | | | | | | | | | More secure api Dont expose user email via API. Fixes #1314
| * | Add /api/users test for admin role. Updated CHANGELOGDmitriy Zaporozhets2014-06-132-0/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix api specsDmitriy Zaporozhets2014-06-133-11/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix helper specsDmitriy Zaporozhets2014-06-131-5/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix gravatar size and update docs for new users APIDmitriy Zaporozhets2014-06-132-1/+54
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Dont expose user email via APIDmitriy Zaporozhets2014-06-1310-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent leaking of users info we reduce amount of user information retrieved via API for normal users. What user can get via API: * if not admin: only id, state, name, username and avatar_url * if admin: all user information * about himself: all informaion Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move gravatar url compose to separate serviceDmitriy Zaporozhets2014-06-131-0/+28
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Small UI fixesDmitriy Zaporozhets2014-06-132-1/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'git-2-docs' into 'master'Dmitriy Zaporozhets2014-06-131-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | Git 2 docs Related to #1318
| * | Recommend setup git 2.0 for installation docsDmitriy Zaporozhets2014-06-131-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-new-mr-502' into 'master'Dmitriy Zaporozhets2014-06-132-2/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Fix 502 error on new merge request page When diff is huge we try to render it that cause 502 error often. After this patch we apply soft limits to diffs. So if diff is huge - we doing show it Fixes #1323
| * | Apply soft diff limits to MergeRequest#new pageDmitriy Zaporozhets2014-06-132-2/+6
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Small ui fixDmitriy Zaporozhets2014-06-131-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-wall'Dmitriy Zaporozhets2014-06-1343-530/+7
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Delete wall notes testsDmitriy Zaporozhets2014-06-1312-155/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Wipe wall notes featureDmitriy Zaporozhets2014-06-1331-375/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Exclude info rows from milestone sorting itemsDmitriy Zaporozhets2014-06-133-2/+4
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'check_ldap_filter' into 'master'Dmitriy Zaporozhets2014-06-132-1/+10
|\ \ | |/ |/| | | Check LDAP user filter during sign-in
| * Check LDAP user filter during sign-inJacob Vosmaer2014-06-132-1/+10
|/
* Merge branch 'autolink-in-project-description' into 'master'Dmitriy Zaporozhets2014-06-134-3/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add autolink to project/group description renderDmitriy Zaporozhets2014-06-124-3/+10
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-121-1/+1
|\
| * Merge pull request #7123 from skv-headless/fix_double_check_all_issuesDmitriy Zaporozhets2014-06-121-1/+1
| |\ | | | | | | fix double check for all issues
| | * fix double check for all issuesskv-headless2014-06-121-1/+1
| | |
* | | Prevent timeout for Commits#stats page for huge reposDmitriy Zaporozhets2014-06-121-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Restyle git tags pageDmitriy Zaporozhets2014-06-124-21/+15
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show proper message for new MR when satellite failsDmitriy Zaporozhets2014-06-122-14/+27
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove unnecessary paddingDmitriy Zaporozhets2014-06-121-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix blob highlight testsDmitriy Zaporozhets2014-06-122-3/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-121-1/+1
|\ \ | | | | | | | | | Ui improvements
| * | Dont truncate project names on group pageDmitriy Zaporozhets2014-06-121-1/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'careful_sidekiq_kill' into 'master'Dmitriy Zaporozhets2014-06-122-1/+2
|\ \ | |/ |/| | | Be more selective when killing stray Sidekiqs
| * Be more selective when killing stray SidekiqsJacob Vosmaer2014-06-122-1/+2
|/ | | | | | 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'.
* Merge branch 'detect_omnibus' into 'master'Dmitriy Zaporozhets2014-06-122-0/+15
|\ | | | | | | Detect omnibus-gitlab in `rake gitlab:check`
| * Skip init script checks on omnibus-gitlabJacob Vosmaer2014-06-122-0/+15
| | | | | | | | Omnibus-gitlab does not use the init script.
* | Merge branch 'files-rational-git-log' into 'master'Dmitriy Zaporozhets2014-06-122-3/+27
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Load last commit for files per 10 items.Dmitriy Zaporozhets2014-06-122-3/+27
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'huge-repo-improve' into 'master'Dmitriy Zaporozhets2014-06-119-10/+37
|\ | | | | | | | | | | | | | | | | | | | | 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
| * More items in CHANGELOGDmitriy Zaporozhets2014-06-111-1/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Use same 30 seconds satellite timeout for all actionsDmitriy Zaporozhets2014-06-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Use gitlab_git to get commit_count in repo. It allows get commits count for ↵Dmitriy Zaporozhets2014-06-113-4/+4
| | | | | | | | | | | | git repos with 100k+ commits Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Describe unicorn timeout value in git over httpDmitriy Zaporozhets2014-06-111-0/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Show spinner on network graph while it loadingDmitriy Zaporozhets2014-06-112-3/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Prevent commit page error if cant collect branches where commit existsDmitriy Zaporozhets2014-06-111-1/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status