home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,449 Commits 48 Branches 340 Tags
9653ddf69332c2f707aef39ea528bb0d3e5f0a08
Commit Graph
9449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 9653ddf693 Merge branch 'rake_setup' into 'master' 
rake setup

Add alias `rake setup` to `rake gitlab:setup`
Mention in developer docs
 2014-04-25 06:04:39 +00:00
Dmitriy Zaporozhets 1f84518ab7 Merge branch 'index_on_iid' into 'master' 
Add uniq db index on project_id+iid

Because:
* its faster
* it solves problem with repeating iid's in one project
 2014-04-25 06:03:03 +00:00
Dmitriy Zaporozhets 7e10d10178 Add doc file for dev rake tasks 2014-04-24 19:53:18 +02:00
Dmitriy Zaporozhets 2eaca54536 Add rake setup alias for gitlab:setup 2014-04-24 19:53:00 +02:00
Dmitriy Zaporozhets d89f26e011 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-24 19:41:34 +02:00
Dmitriy Zaporozhets ae7bd9f7c0 Migrate invalid rows with missing iids or duplicates 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets 3bf1cff421 Add iids changelog entry 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets c46a061270 Add uniq db index on project_id+iid 2014-04-24 19:39:09 +02:00
Dmitriy Zaporozhets 2a99f18478 Merge branch 'mysql_field_limits' into 'master' 
Adjust MySQL limits for existing installations
 2014-04-24 17:37:38 +00:00
Dmitriy Zaporozhets f5b88710ea Merge branch 'tests_for_fog' into 'master' 
Tests for fog
 2014-04-24 17:01:49 +00:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets 728bdfc504 Merge pull request #6843 from evanlucas/bug/6546 
Fix syntax highlighting
 2014-04-24 09:38:44 +03:00
Dmitriy Zaporozhets 1feaa336ed Merge pull request #6848 from hszcg/master 
Fix diff height
 2014-04-24 09:22:31 +03:00
Chenguang Zhang 7dd0860e5a Remove fixed height for diff table 2014-04-23 23:02:25 +08:00
Dmitriy Zaporozhets e54b457ea3 Improve ssh_host settings 2014-04-23 16:22:49 +02:00
Dmitriy Zaporozhets 2134e18ec6 Fix default ssh_host setting 2014-04-23 16:19:59 +02:00
Marin Jankovski 7c5b61224a We are at 6.9.0.pre. 2014-04-23 15:50:05 +02:00
Dmitriy Zaporozhets b8d3148311 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2014-04-23 09:22:49 +00:00
Dmitriy Zaporozhets 7c1c03888c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-23 09:21:52 +00:00
Jacob Vosmaer b810ef1099 Merge branch 'bump_gitlab_shell' into 'master' 
Bump gitlab shell
 2014-04-23 09:20:33 +00:00
Jacob Vosmaer 77e565d347 Bump the required gitlab-shell version to 1.9.3 2014-04-23 11:13:21 +02:00
Dmitriy Zaporozhets 3bb8c17cc3 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-23 09:09:45 +00:00
Jacob Vosmaer acebfdc7b1 Move changelog entries to 6.9.0 2014-04-23 11:09:38 +02:00
Jacob Vosmaer cd61239540 Move the adapter check to the migration 2014-04-23 11:08:51 +02:00
Jacob Vosmaer 43e77099d8 Adjust MySQL limits for existing installations 2014-04-23 11:07:36 +02:00
Dmitriy Zaporozhets 3295a4db9d Merge branch 'email_in_gravatar_urls' into 'master' 
allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
 2014-04-23 08:52:15 +00:00
Dmitriy Zaporozhets 972e40cc47 Merge branch 'bug-to-ldap-configuration' into 'master' 
LDAP Configuration Fix

This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
 2014-04-23 08:49:09 +00:00
Dmitriy Zaporozhets aaffbe1c2e Merge branch 'render_docs' into 'master' 
Fix code block that doesn't render correctly in doc.gitlab.com

Probably fixes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/6
 2014-04-23 08:20:56 +00:00
Dmitriy Zaporozhets 2876f5d514 Merge pull request #6795 from cirosantilli/markdown-styleguide 
Add markdown styleguide.
 2014-04-23 10:04:37 +03:00
Dmitriy Zaporozhets e680911767 Merge pull request #6827 from demisx/master 
Add ability to set different ssh host, if different from http/https
 2014-04-23 10:04:08 +03:00
Dmitriy Zaporozhets cf2058c0f1 Merge pull request #6781 from thekid/master 
Complete admin APIs for SSH Keys
 2014-04-23 10:03:25 +03:00
Dmitriy Zaporozhets 7b4a7625aa Merge pull request #6840 from hboomsma/patch-1 
added target_project_id to merge_requests.md
 2014-04-23 10:01:59 +03:00
Dmitriy Zaporozhets 2f726a11e6 Merge pull request #6775 from cirosantilli/glob-include-sass-dirs 
Include SASS in subdirectories with glob.
 2014-04-23 10:01:38 +03:00
Dmitriy Zaporozhets 6d4f5cd901 Merge pull request #6836 from terrywang/upgrader-doc 
Break up the long upgrade one liner & add Bash syntax highlighting
 2014-04-23 10:01:11 +03:00
Dmitriy Zaporozhets 7fab63b41f Merge branch 'namespace_redis_cache' into 'master' 
Give the Rails cache its own Redis namespace
 2014-04-23 07:00:01 +00:00
Dmitriy Zaporozhets 14c9674994 Merge branch 'missing-part-of-active-user' into 'master' 
Missing part of active user
 2014-04-23 06:57:28 +00:00
Evan Lucas 4134b38a84 Fix syntax highlighting 
Don't break highlighting on multi-line spans (multi-line comments for
example)
 2014-04-22 17:06:16 -05:00
Achilleas Pipinellis 5a521e56cb Newline between sentence and code block 2014-04-22 18:21:32 +03:00
Hidde Boomsma 2a944b1d9f added target_project_id to merge_requests.md 
Added description about optional field target_project_id for merge requests.
 2014-04-22 15:35:09 +02:00
Dmitriy Zaporozhets bf855d19cb Merge branch 'version680' into 'master' 
Version680

VERSION to 6.8.0
 2014-04-22 12:55:30 +00:00
Job van der Voort 241132b6eb version 6.8.0 v6.8.0 2014-04-22 14:51:38 +02:00
Dmitriy Zaporozhets 6fd13ab041 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-22 14:37:28 +02:00
Dmitriy Zaporozhets 07deb2254b Merge branch 'shell_version_install_doc' into 'master' 
Update Shell version in the Install doc
 2014-04-22 12:34:02 +00:00
Sytse Sijbrandij 7e10d01342 Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via-env-variable 
Allow to overwrite location of gitlab.yml config file.
 2014-04-22 13:52:00 +02:00
Sytse Sijbrandij 52a247da5e Merge pull request #6783 from pkgr/allow-secret-token-env 
Allow to specify secret token via SECRET_KEY_BASE environment variable.
 2014-04-22 13:51:34 +02:00
Sytse Sijbrandij 6d4e2776ca Merge branch 'detailed-monthly-release' into 'master' 
Detailed monthly release

Fixes #1190
 2014-04-22 11:26:39 +00:00
Job van der Voort e79c915d3b remove redudant text in release doc 2014-04-22 12:54:23 +02:00
Marin Jankovski 19438af8d1 Update installation guide with new shell version. 2014-04-22 12:23:57 +02:00
Job van der Voort 223070b3fe add steps to monthly releases 2014-04-22 12:06:54 +02:00
Dmitriy Zaporozhets 1b491c364d Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-22 11:41:29 +02:00