Commit Graph
9347 Commits
Author SHA1 Message Date
GitLab 556ddbcad4 Add schema number change. 2014-04-18 12:05:00 +02:00
GitLab 7ee0a94e8b Don't update the changelog since the feature landed in 6.8. 2014-04-16 21:14:40 +02:00
GitLab cf43bf3620 Add db index for active user display. 2014-04-16 21:05:13 +02:00
Dmitriy Zaporozhets 0d3ba71bcb Merge pull request #6774 from cirosantilli/issue-form-rename-fields
Rename issue form tags Subject -> Title and Details -> Description
2014-04-15 09:39:29 +03:00
Dmitriy Zaporozhets 9c7a9d92ff Merge pull request #6773 from tsigo/rs-tag-page-sorting
Use VersionSorter on the Project > Tags page
2014-04-15 09:30:39 +03:00
Ciro Santilli d2b4948a1f Rename issue form tags to match MR and params. 2014-04-14 23:36:12 +02:00
Dmitriy Zaporozhets 6be82c5e3b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-14 22:11:47 +03:00
Dmitriy Zaporozhets 17befe2a2a Merge pull request #6761 from jvanbaarsen/fixed-statemachine-warning
Make the db and statemachine default is the same
2014-04-14 21:33:18 +03:00
Dmitriy Zaporozhets 3c91c5810e Merge pull request #6772 from dblessing/commit_counter
Show actual commit count on project dashboard
2014-04-14 21:32:47 +03:00
Drew Blessing f34972358c Show actual commit count on project dashboard 2014-04-14 12:01:18 -05:00
Robert Speicher c803e78fd0 Use VersionSorter on the Project > Tags page 2014-04-14 12:40:27 -04:00
Jeroen van Baarsen 5554eb166b Fixed some hound notices 2014-04-14 15:24:37 +02:00
Jeroen van Baarsen 802087c937 Changed default in the database for the statemachine 2014-04-14 15:22:57 +02:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master'
Satellite exists in automerge check
2014-04-14 13:21:49 +00:00
Dmitriy Zaporozhets 2ed56ce9d4 Merge branch 'speed_up_wiki_pages' into 'master'
Speed up wiki pages page
2014-04-14 13:20:35 +00:00
Dmitriy Zaporozhets 1b60913e8d Merge branch 'simple-pointers-in-readme' into 'master'
Simple pointers in readme
2014-04-14 13:19:29 +00:00
Dmitriy Zaporozhets 92b5e6b3bf Merge branch 'link-to-oauth-doc' into 'master'
Link to oauth doc

Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
2014-04-14 13:19:00 +00:00
Sytse Sijbrandij 09d4113a31 Merge branch '100k' into 'master'
100k
2014-04-14 11:56:43 +00:00
dosire c5bbb15d0c 100k organizations use GitLab. 2014-04-14 13:50:31 +02:00
Sytse Sijbrandij ec5bfec24e Merge branch 'postgres_installation' into 'master'
No need to edit database.yml for standard Postgres
2014-04-14 09:55:59 +00:00
Dmitriy Zaporozhets 884390de20 Merge pull request #6711 from marciotoze/patch-1
Update installation.md
2014-04-14 12:38:42 +03:00
Dmitriy Zaporozhets 363a8ca02f Merge pull request #6706 from jvanbaarsen/add-dump-rdb-to-ignore
Added the dump.rdb file to gitignore
2014-04-14 12:38:17 +03:00
Sytse Sijbrandij f2b2f2c2dc Merge branch 'add_patch_release_doc' into 'master'
Add patch release documentation for developers
2014-04-14 07:16:38 +00:00
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
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
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