summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* AMR warning for merge requests officers.is-it-amrdosire2014-04-131-0/+7
|
* Merge pull request #6753 from jvanbaarsen/split_testsDmitriy Zaporozhets2014-04-1123-24/+49
|\ | | | | Proposal for split testing
| * Updated the travis scriptJeroen van Baarsen2014-04-111-2/+4
| |
| * Added API testing groupJeroen van Baarsen2014-04-1120-37/+39
| |
| * Proposal for split testingJeroen van Baarsen2014-04-113-12/+33
| |
* | Merge pull request #6760 from jvanbaarsen/label-color-lowercaseDmitriy Zaporozhets2014-04-112-1/+14
|\ \ | |/ |/| Determine label color based on lowercase name
| * Determine label color based on lowercase nameJeroen van Baarsen2014-04-112-1/+14
|/
* Merge pull request #6749 from cirosantilli/where-to-contribSytse Sijbrandij2014-04-111-0/+4
|\ | | | | Say on CONTRIBUTING that issues are accepted at both gitlab and github.
| * Say issues are accepted at both gitlab and github.Ciro Santilli2014-04-111-0/+4
|/
* Merge pull request #6741 from dblessing/omniauth_docsSytse Sijbrandij2014-04-107-59/+224
|\ | | | | Add OmniAuth Documentation
| * Add OmniAuth DocumentationDrew Blessing2014-04-107-59/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitHub OmniAuth docs Google instructions Google instructions Merge master Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Add Google and Twitter docs Add screenshot Add screenshot Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Finalize current docs Finalize current docs Add existing user information Add twitter Add twitter Add Twitter disclaimer Add Twitter disclaimer remove old doc Remove unnecessary link Revert omniauth provider format Add OmniAuth Documentation Add GitHub OmniAuth docs Google instructions Google instructions Merge master Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Add Google and Twitter docs Add screenshot Add screenshot Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Finalize current docs Finalize current docs Add existing user information Add twitter Add twitter Add Twitter disclaimer Add Twitter disclaimer remove old doc Remove unnecessary link Revert omniauth provider format Use omniauth again Remove notice Restore whitespace Slight changes
* | Fix download link for huge MR diffsDmitriy Zaporozhets2014-04-102-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix avatars in the network graph for relative-url setups.Thomas Moschny2014-04-101-2/+2
| |
* | Merge branch 'no-link-to-centos-guide' into 'master'Dmitriy Zaporozhets2014-04-102-5/+3
|\ \ | | | | | | | | | No link to centos guide
| * | Remove the vmi's.dosire2014-04-101-3/+1
| | |
| * | No capital letter for recommended.dosire2014-04-101-1/+1
| | |
| * | Steer people to the packages since people encounter less errors installing ↵dosire2014-04-102-2/+2
| |/ | | | | | | those.
* | Merge branch 'ensure_default_fields' into 'master'Dmitriy Zaporozhets2014-04-1068-228/+298
|\ \ | |/ |/| | | Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
| * Modify project default valuesDmitriy Zaporozhets2014-04-091-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix default value for project modelDmitriy Zaporozhets2014-04-091-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Re-annotate modelsDmitriy Zaporozhets2014-04-0968-228/+286
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add values to default fields to prevent 500 error when migrate from MySQL to ↵Dmitriy Zaporozhets2014-04-093-0/+13
| | | | | | | | | | | | Postgres Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-091-0/+4
|\ \
| * \ Merge pull request #6729 from hiroponz/fix-seed-fuDmitriy Zaporozhets2014-04-091-0/+4
| |\ \ | | | | | | | | Fix rake db:seed_fu ENV=development
| | * | Fix rake db:seed_fu ENV=developmentHiroyuki Sato2014-04-091-0/+4
| | |/ | | | | | | | | | This problem was reported on https://gitlab.com/gitlab-org/cookbook-gitlab/issues/46
* | | Fix note body alignDmitriy Zaporozhets2014-04-091-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Reduce note header paddingDmitriy Zaporozhets2014-04-091-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-091-1/+1
|\ \
| * | Typo fix in process.mdJeroen van Baarsen2014-04-091-1/+1
| |/
* | Merge branch 'ensure_satellite_exists' into 'master'Dmitriy Zaporozhets2014-04-091-3/+3
|\ \ | | | | | | | | | Ensure satellite exists instead of raising an error
| * | Dont raise an error with satellites, make sure it exists.Marin Jankovski2014-04-091-3/+3
| | |
* | | Merge branch 'clean_old_archives' into 'master'Dmitriy Zaporozhets2014-04-093-0/+8
|\ \ \ | | | | | | | | | | | | Clean old archives from repository downloads directory
| * | | Add to clean archives to changelog.Marin Jankovski2014-04-091-0/+1
| | | |
| * | | Remove archives older than 2 hours.Marin Jankovski2014-04-092-0/+7
| |/ /
* | | Merge branch 'wiki-refactoring' into 'master'Dmitriy Zaporozhets2014-04-0917-71/+76
|\ \ \ | |/ / |/| | | | | | | | | | | Wiki refactoring Better names for variables and classes
| * | Use ProjectWiki instead of GollumWiki in codeDmitriy Zaporozhets2014-04-099-137/+19
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor wiki modelDmitriy Zaporozhets2014-04-092-4/+123
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Rename wiki variablesDmitriy Zaporozhets2014-04-097-49/+53
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_on_empty_repo' into 'master'Dmitriy Zaporozhets2014-04-093-1/+31
|\ \ | | | | | | | | | Fix for error 500 on create issue for empty repo
| * | Add issue to an empty repo, test.Marin Jankovski2014-04-083-1/+31
| | |
* | | Merge branch 'installation-order' into 'master'Dmitriy Zaporozhets2014-04-091-6/+4
|\ \ \ | | | | | | | | | | | | Installation order
| * | | People forget to compile their assets, start after doing that.dosire2014-04-091-6/+4
|/ / /
* | | Merge branch 'why-all-the-dev' into 'master'Sytse Sijbrandij2014-04-081-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Why all the dev packages Document the need for dev packages since Multiple people asked about it. /cc @marc @jacobvosmaer
| * | Nicer formulation.dosire2014-04-081-1/+1
| | |
| * | Document the need for dev packages since Multiple people asked about it.dosire2014-04-081-1/+1
| |/
* | Merge branch 'indicate-it-is-a-filter' into 'master'Dmitriy Zaporozhets2014-04-081-1/+1
|\ \ | |/ |/| | | Indicate it is a filter
| * Use placeholder to prevent using the find box to add new members.dosire2014-04-081-1/+1
| |
* | Update grape-entityDmitriy Zaporozhets2014-04-082-11/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'gollum-lib' into 'master'Dmitriy Zaporozhets2014-04-084-39/+41
|\ \ | | | | | | | | | Use original gem gollum-lib
| * | Fix test broken by 89c942908cc1d98dfd4af1f89b69704f691a0edfDmitriy Zaporozhets2014-04-081-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>