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
Philzen
baec3f9bd7
# Fix description Typo
2014-04-23 08:57:54 +02: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
Job van der Voort
3d3e3913b5
Merge pull request #6806 from robertd/fix-typo-in-docs
...
Fix minor typo in docs
2014-04-22 11:39:10 +02:00
Dmitriy Zaporozhets
814a459527
Merge branch '512mb' into 'master'
...
512mb
Most people only care about the 512mb option, we should mention that with one worked you don't get http pushes.
2014-04-22 07:06:15 +00:00
Job van der Voort
3e50d615a2
Merge pull request #6808 from robertd/upgrade-docs-6.7-6.8
...
Update title and revert section of 6.7-to-6.8 docs
2014-04-22 08:25:55 +02:00
Terry Wang
03b56b9446
Break the one liner & add markdown syntax highlighting for Bash
2014-04-22 14:22:55 +10:00
Travis Odom
e9d4587ff1
Actually use the 'user_filter' configuration option
2014-04-21 15:48:42 +00:00
robertd
e2fd2bf9f5
Update title and revert section of 6.7-to-6.8 docs
2014-04-21 09:43:20 -04:00
dosire
01799721dc
Take into account active users.
2014-04-21 12:34:08 +02:00
Ciro Santilli
e365cd8452
Add markdown styleguide.
2014-04-21 12:19:46 +02:00
Marcus Ilgner
61e6863403
Add info about exposed Project::archived to API docs
2014-04-20 12:01:55 +02:00
Dmitri Moore
db86fe47ce
Add ability to set different ssh host, if different from http/https
2014-04-18 20:20:43 -07:00
Marcus Ilgner
b5a73b1f90
Expose archive status of projects in API
...
That way clients like Gitlab CI can decide to show or hide projects
based on that information
2014-04-18 17:55:06 +02:00
Sytse Sijbrandij
9b7dd8b4c0
Merge pull request #6821 from skv-headless/fix_type
...
fix installation.md typo
2014-04-18 15:05:50 +02:00
Timm Friebe
05e792b4c4
Implement GET /users/:uid/keys for admin users
...
Complements POST operation added in gitlabhq/gitlabhq#3146
Implement DELETE /users/:uid/keys/:id for admin users
Fix "Line is too long. [83/80]"
Use single quotes as advised
Use single quotes as advised
Use single quotes as advised
Fix missing space around { and }
Fix typo in documentation
Only catch ActiveRecord::RecordNotFound, let other exceptions propagate
Raise a "404 Not found" if key to be deleted cannot be found
As requested by @jvanbaarsen in https://github.com/gitlabhq/gitlabhq/pull/6781#discussion_r11735114
Remove tab
Unconfigured vim on this box, grrrr./
2014-04-18 14:16:19 +02:00
Evgeniy Sokovikov
bc732a89be
fix installation.md type
...
depency -> dependency
2014-04-18 14:35:38 +04:00
GitLab
556ddbcad4
Add schema number change.
2014-04-18 12:05:00 +02:00
Job van der Voort
f0a4f62c7e
start writing deploy key to multiple projects
2014-04-18 11:13:15 +02:00
Sytse Sijbrandij
2bfd95d850
Merge branch 'workflow_documentation' into 'master'
...
Workflow documentation
2014-04-18 08:49:18 +00:00
Jacob Vosmaer
f0f0ac6321
Remove help document title
...
Help pages on doc.gitlab.com/ce are missing titles. This needs to be
solved globally.
2014-04-18 10:39:04 +02:00
Jacob Vosmaer
eadcd278be
Bring back 'Authorization for Merge Requests'
...
This text was deleted in 564c37d9b6 .
2014-04-18 10:10:40 +02:00
Jacob Vosmaer
b9e040f8bf
Link to the workflow index
2014-04-18 10:03:57 +02:00
Dmitriy Zaporozhets
ad61a61304
Merge branch 'update-monthly-release-doc' into 'master'
...
Update monthly release doc
/cc @sytse @jacobvosmaer @marin
2014-04-17 18:12:28 +00:00
Dmitriy Zaporozhets
43ac196dfb
Merge branch 'official-location' into 'master'
...
Official location
I got two today:
https://twitter.com/wonderb0lt/status/456545094644936705
https://twitter.com/madpew/status/456758525398884352
2014-04-17 18:11:45 +00:00
robertd
b3e5b12e9b
Fix minor typo in docs
2014-04-17 10:15:05 -06:00
Job van der Voort
f81123811e
add dependency check to montly release doc and tweet instructions
2014-04-17 16:30:24 +02:00
dosire
bd183bfba9
Prevent questions about the canonical source.
2014-04-17 13:45:06 +02:00
Dmitriy Zaporozhets
b14c475a4c
Merge branch 'rc1-updates' into 'master'
...
Rc1 updates
#1178
Please check it well 😃
If this gets merged, the annotated version tag 6.8.0.rc1 will point to https://dev.gitlab.org/gitlab/gitlabhq/commit/e6b668ab0169f981a5c4162cd8625daf02e6f5a8
/cc @sytse @jacobvosmaer @marin
2014-04-17 11:02:36 +00:00
Job van der Voort
f931195d34
bump versions in update guide
2014-04-17 10:47:35 +02:00
Job van der Voort
c2ad30638a
add 67-68 update guide
2014-04-17 10:15:50 +02:00
Job van der Voort
e6b668ab01
update VERSION to 6.8.0.rc1
v6.8.0.rc1
2014-04-17 09:42:33 +02:00
Job van der Voort
00b576e67d
update version in installation doc
2014-04-17 09:42:08 +02:00
George Dewar
5ef7fdbd54
Fix bug in which a line count without empty lines was incorrectly used
2014-04-17 14:42:05 +12:00
Ciro Santillli
07a9d44de7
Commit message textareas have 72 char mark line.
2014-04-16 21:55:36 +02:00
GitLab
7ee0a94e8b
Don't update the changelog since the feature landed in 6.8.
2014-04-16 21:14:40 +02:00