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,395 Commits 48 Branches 340 Tags
v6.8.0
Commit Graph
9395 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sytse Sijbrandij 9b7dd8b4c0 Merge pull request #6821 from skv-headless/fix_type 
fix installation.md typo
 2014-04-18 15:05:50 +02:00
Evgeniy Sokovikov bc732a89be fix installation.md type 
depency -> dependency
 2014-04-18 14:35:38 +04: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
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
Cyril Rohr b29171d9ec Allow to specify secret token via environment variable. 2014-04-15 19:27:25 +01:00
Cyril Rohr 4691285989 Allow to overwrite location of gitlab.yml config file. 2014-04-15 19:23:55 +01: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