Arnaud ABELARD
ca19260812
Merge branch 'email_in_gravatar_urls' of gitlab.com:arnaud/gitlab-ce into email_in_gravatar_urls
2014-04-12 23:23:57 +02:00
Arnaud ABELARD
5d7bdf7642
allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
...
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size} "
add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
2014-04-12 23:10:45 +02:00
Dmitriy Zaporozhets
0f31acd0ec
Merge pull request #6753 from jvanbaarsen/split_tests
...
Proposal for split testing
2014-04-11 22:54:49 +03:00
Jeroen van Baarsen
490ab228e6
Updated the travis script
2014-04-11 21:52:49 +02:00
Jeroen van Baarsen
5dd2f36ae1
Added API testing group
2014-04-11 21:45:56 +02:00
Dmitriy Zaporozhets
1942b97de3
Merge pull request #6760 from jvanbaarsen/label-color-lowercase
...
Determine label color based on lowercase name
2014-04-11 22:31:33 +03:00
Jeroen van Baarsen
28f1a5d7d8
Determine label color based on lowercase name
2014-04-11 19:06:27 +02:00
Jeroen van Baarsen
25eadf0c5b
Proposal for split testing
2014-04-11 13:37:33 +02:00
Sytse Sijbrandij
4881d4932e
Merge pull request #6749 from cirosantilli/where-to-contrib
...
Say on CONTRIBUTING that issues are accepted at both gitlab and github.
2014-04-11 12:09:57 +02:00
Ciro Santilli
def67592b4
Say issues are accepted at both gitlab and github.
2014-04-11 10:38:20 +02:00
Arnaud Abélard
8419a2a4eb
add mentions of the different placeholders possible for gravatar urls, mentionning the new %{email}
2014-04-10 14:17:25 +00:00
Sytse Sijbrandij
731c009a80
Merge pull request #6741 from dblessing/omniauth_docs
...
Add OmniAuth Documentation
2014-04-10 14:36:40 +02:00
Drew Blessing
728b05cab7
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
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
2014-04-10 07:31:54 -05:00
Dmitriy Zaporozhets
415c0f4bbe
Fix download link for huge MR diffs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-10 13:45:02 +03:00
Thomas Moschny and Marin Jankovski
5b123dbf7f
Fix avatars in the network graph for relative-url setups.
2014-04-10 10:05:40 +02:00
Dmitriy Zaporozhets
5830d672f7
Merge branch 'no-link-to-centos-guide' into 'master'
...
No link to centos guide
2014-04-10 07:26:13 +00:00
dosire
355b120224
Remove the vmi's.
2014-04-10 09:23:10 +02:00
dosire
549758b387
No capital letter for recommended.
2014-04-10 09:21:30 +02:00
Dmitriy Zaporozhets
89ecb19126
Merge branch 'ensure_default_fields' into 'master'
...
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
2014-04-10 07:20:45 +00:00
dosire
670e02982c
Steer people to the packages since people encounter less errors installing those.
2014-04-10 09:20:19 +02:00
Dmitriy Zaporozhets
03472b4fc0
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-04-09 21:26:34 +03:00
Dmitriy Zaporozhets
7793417206
Fix note body align
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 21:26:11 +03:00
Dmitriy Zaporozhets
5c9127ea29
Merge pull request #6729 from hiroponz/fix-seed-fu
...
Fix rake db:seed_fu ENV=development
2014-04-09 21:23:25 +03:00
Dmitriy Zaporozhets
fd8a165df7
Reduce note header padding
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 21:20:54 +03:00
Dmitriy Zaporozhets
67b07f96ea
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-04-09 21:16:50 +03:00
Dmitriy Zaporozhets
9f6a8ff4b5
Modify project default values
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 20:55:09 +03:00
Dmitriy Zaporozhets
f23dcac91b
Merge branch 'ensure_satellite_exists' into 'master'
...
Ensure satellite exists instead of raising an error
2014-04-09 17:50:26 +00:00
Dmitriy Zaporozhets
4e9add7c2c
Merge branch 'clean_old_archives' into 'master'
...
Clean old archives from repository downloads directory
2014-04-09 17:50:09 +00:00
Dmitriy Zaporozhets
fae6eb6353
Merge branch 'wiki-refactoring' into 'master'
...
Wiki refactoring
Better names for variables and classes
2014-04-09 17:48:46 +00:00
Marin Jankovski
63ba983511
Dont raise an error with satellites, make sure it exists.
2014-04-09 17:13:44 +02:00
Marin Jankovski
944ebb8e2e
Add to clean archives to changelog.
2014-04-09 15:17:37 +02:00
Marin Jankovski
b2959c4102
Remove archives older than 2 hours.
2014-04-09 15:09:11 +02:00
Dmitriy Zaporozhets
466f0fb762
Fix default value for project model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 15:05:40 +03:00
Dmitriy Zaporozhets
36f861f1b1
Re-annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets
1bd28994cc
Use ProjectWiki instead of GollumWiki in code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets
26ec74c446
Refactor wiki model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 14:35:26 +03:00
Dmitriy Zaporozhets
b27c42be87
Rename wiki variables
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets
c5cdd07899
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-09 13:36:25 +03:00
Dmitriy Zaporozhets
71678f08f8
Merge branch 'issue_on_empty_repo' into 'master'
...
Fix for error 500 on create issue for empty repo
2014-04-09 10:11:45 +00:00
Jeroen van Baarsen
f5b7899cf7
Typo fix in process.md
2014-04-09 11:38:33 +02:00
Dmitriy Zaporozhets
e099d66213
Merge branch 'installation-order' into 'master'
...
Installation order
2014-04-09 06:19:04 +00:00
dosire
12c49dd989
People forget to compile their assets, start after doing that.
2014-04-09 07:58:57 +02:00
Hiroyuki Sato
0ed2f8ded9
Fix rake db:seed_fu ENV=development
...
This problem was reported on https://gitlab.com/gitlab-org/cookbook-gitlab/issues/46
2014-04-09 11:02:45 +09:00
Sytse Sijbrandij
797813b98f
Merge branch 'why-all-the-dev' into 'master'
...
Why all the dev packages
Document the need for dev packages since Multiple people asked about it.
/cc @marc @jacobvosmaer
2014-04-08 19:15:59 +00:00
dosire
b2b790afa7
Nicer formulation.
2014-04-08 17:18:17 +02:00
Marin Jankovski
e617cf95d4
Add issue to an empty repo, test.
2014-04-08 17:12:57 +02:00
Dmitriy Zaporozhets
9a02e27b84
Merge branch 'indicate-it-is-a-filter' into 'master'
...
Indicate it is a filter
2014-04-08 14:47:42 +00:00
dosire
9924492adf
Document the need for dev packages since Multiple people asked about it.
2014-04-08 16:10:10 +02:00
Dmitriy Zaporozhets
fead96788c
Update grape-entity
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-08 16:02:53 +03:00
Dmitriy Zaporozhets
f382983f1a
Merge branch 'gollum-lib' into 'master'
...
Use original gem gollum-lib
2014-04-08 12:58:58 +00:00