Commit Graph
14039 Commits
Author SHA1 Message Date
Marin Jankovski c927f0620a Update security document with the link to patch document. 2014-04-14 09:06:42 +02:00
Dmitriy Zaporozhets fc6517f1da Merge pull request #6752 from jvanbaarsen/new-styleguides
Linked to new styleguides
2014-04-14 09:55:12 +03:00
Dmitriy Zaporozhets fe2d8a4b6d Merge pull request #6763 from Razer6/sync_issue_pattern
Sync default issue closing pattern in doc and implementation
2014-04-14 09:54:33 +03:00
Dmitriy Zaporozhets 43369948b3 Merge pull request #6767 from leventyalcin/master.slackdoc
Slack documentation added
2014-04-14 09:54:10 +03:00
Dmitriy Zaporozhets 2152fa0f8c Merge pull request #6768 from omkelderman/master
Replace $your_email with actual email-address in ssh-help-page
2014-04-14 09:40:27 +03:00
Dmitriy Zaporozhets f20966fda5 Merge branch 'jsternberg/gitlab-ce-161-emails-on-push-service' 2014-04-14 09:27:30 +03:00
Dmitriy Zaporozhets 28e6e1b1ab Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-04-14 09:27:11 +03:00
Olle Kelderman ca6978dfc5 Replace $your_email with actual email-address. Fixes #6714 2014-04-14 05:00:48 +02:00
Levent YALCIN 133da28058 Slack documentation added 2014-04-14 03:26:48 +03:00
Dmitriy Zaporozhets 352bb97266 Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page
Better title format for wiki page
2014-04-13 20:13:02 +03:00
Dmitriy Zaporozhets 53b52b11d5 Merge pull request #6699 from criteo/api_get_open_merge_requests
Add optional parameter to list merge requests
2014-04-13 20:10:39 +03:00
Dmitriy Zaporozhets 481bbd7534 Merge pull request #6766 from jvanbaarsen/split-test-even-further
Split feature tests out to different build job
2014-04-13 20:07:53 +03:00
Dmitriy Zaporozhets 156465cedd Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api
Expose event and mergerequest timestamps in API
2014-04-13 20:06:43 +03:00
Jeroen van Baarsen 8362026a33 Split feature tests out to different build job 2014-04-13 19:05:52 +02:00
Dmitriy Zaporozhets 6d57accef2 Merge pull request #6764 from BrettBukowski/classname-typo
Fix "project-name" span classname typo
2014-04-13 20:04:43 +03:00
Dmitriy Zaporozhets 5f9592e4b0 Merge pull request #6405 from awiddersheim/fix_space_in_commit_message
Fix extra space added in beginning of commit message
2014-04-13 20:04:25 +03:00
Dmitriy Zaporozhets d1547f86d9 Merge pull request #6765 from jvanbaarsen/fixed-missing-buid-option
Fixed a typo fix in the travis build
2014-04-13 20:01:23 +03:00
Sytse Sijbrandij 5ff086b32d Merge branch 'is-it-amr' into 'master'
Is it amr
2014-04-13 16:09:53 +00:00
GitLab bb7df7663a Add short path route for groups. 2014-04-13 17:46:41 +02:00
dosire d97d811d2a List the next steps. 2014-04-13 16:40:56 +02:00
dosire d16bb8c025 AMR warning for merge requests officers. 2014-04-13 14:18:25 +02:00
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
Jeroen van Baarsen 0fd26ea46c Fixed a typo fix in the travis build 2014-04-12 09:05:08 +02:00
Brett Bukowski c1c9e11457 Fix "project-name" span classname typo 2014-04-11 16:00:58 -06:00
Robert Schilling e9409d1f4d Synchronize default issue closing pattern in documetation and implementation, fixes #6742 2014-04-11 23:13:21 +02:00
Jeroen van Baarsen c898dc00dc Make the db and statemachine default is the same 2014-04-11 22:14:30 +02:00
Jeroen van Baarsen 47f3eec515 Put the bbatsov back in 2014-04-11 22:04:56 +02:00
Jeroen van Baarsen 276a35c75c Linked to new styleguides
This way HoundCI makes more sense.
2014-04-11 22:04:56 +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
Paul Badcock 72e82151f1 Update to fix ruby 1.9.3 issue with slack-notifier 2014-04-11 17:04:48 +00:00
Paul Badcock 993831ff7d Update slack to fix issues with ruby 1.9.3 2014-04-11 17:03:41 +00:00
Jonathan A. Sternberg 9cb2a4ac8a Fix emails on push service when a single commit is pushed
This fixes issue #161.
2014-04-11 11:54:02 -04: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
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Marin Jankovski 872482678b Speed up loading and add pagination to wiki pages page. 2014-04-11 10:02:52 +02:00
Mart Sõmermaa 0da8428f8e Expose event and and mergerequest timestamps in API, make code more DRY. 2014-04-10 20:24:20 +03: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
dosire db1be88f21 Link to the doc. 2014-04-10 14:39:58 +02: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
Marin Jankovski f7d2f36084 EE changelog note. 2014-04-10 11:28:12 +02:00
Marin Jankovski 05eb224486 Add patch release document. 2014-04-10 11:23:44 +02:00