home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,367 Commits 48 Branches 340 Tags
b14c475a4cb210c8c242d36b8e25974d87c19cba
Commit Graph
9367 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 9b52affe31 Merge pull request #6789 from zzjin/patch-1 
fix bundle install error
 2014-04-16 10:03:13 +03:00
Dmitriy Zaporozhets cd75572b38 Merge pull request #6784 from jvanbaarsen/remove-unused-sass-extends 
Removed missing sass selectors
 2014-04-16 09:16:50 +03:00
zzjin fc7188cc06 fix bundle install error 
fix issue of bundle install error after slack-notifier upgraded. upgrade to 0.3.2
 2014-04-16 13:19:30 +08:00
Jeroen van Baarsen 891b67c800 Removed missing sass selectors 2014-04-15 20:50:16 +02:00
Dmitriy Zaporozhets cad9572ee9 Merge pull request #6780 from cbordei/hotfix/issue-6615 
Fixed multiple close issue #6615
 2014-04-15 18:37:45 +03:00
Cristian Bordei 8e278cfe75 Fixed multiple close issue #6615 2014-04-15 16:55:07 +03:00
Dmitriy Zaporozhets cd6232187b Merge branch 'restful-naming' into 'master' 
Restful naming

The name endpoint is more common for RPC interfaces http://en.wikipedia.org/wiki/Web_Services_Description_Language#Objects_in_WSDL_1.1_.2F_WSDL_2.0 where the url is the same for different calls on the same endpoint. With restful interfaces the url changes.
 2014-04-15 13:10:40 +00:00
dosire b2b2989f7f Endpoints are for RPC interfaces, we have resources. 2014-04-15 14:52:02 +02:00
Dmitriy Zaporozhets fd61e3e901 Merge branch 'routing-for-groups' into 'master' 
Routing for groups

Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
 2014-04-15 10:36:52 +00:00
Dmitriy Zaporozhets da4c13f11d Merge branch 'active-users' into 'master' 
Active users

Show the number of active users in the dashboard.
 2014-04-15 10:36:41 +00:00
Dmitriy Zaporozhets ca0691ca8e Merge branch 'prevent-two-links-in-emails' into 'master' 
Prevent-two-links-in-emails

Only one link per email to prevent clicking the wrong one.
 2014-04-15 10:36:25 +00:00
Dmitriy Zaporozhets f2040c2951 Merge branch 'master' into 'master' 
Issue 155: Slack-notifier update to fix 500 errors

Slack-notifier 0.2.0 is broken for Rails 1.9.3

This update bumps the Gemfile/Gemfile.lock to use 0.3.2 version of the gem file to correct the issue.

slack-notifier changelog addressing the issue

https://github.com/stevenosloan/slack-notifier/blob/master/changelog.md

Issue 155 about the error

https://gitlab.com/gitlab-org/gitlab-ce/issues/155
 2014-04-15 08:45:30 +00:00
GitLab 61ef72e5d1 Fixes to group route tests, thanks DZ 2014-04-15 10:40:37 +02:00
GitLab b011486731 Add monthly active users to the admin dashboard. 2014-04-15 10:23:37 +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