summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update VERSION to 6.8.0.rc1v6.8.0.rc1Job van der Voort2014-04-171-1/+1
* update version in installation docJob van der Voort2014-04-171-2/+2
* Merge pull request #6789 from zzjin/patch-1Dmitriy Zaporozhets2014-04-161-2/+2
|\
| * fix bundle install errorzzjin2014-04-161-2/+2
* | Merge pull request #6784 from jvanbaarsen/remove-unused-sass-extendsDmitriy Zaporozhets2014-04-162-4/+0
|\ \ | |/ |/|
| * Removed missing sass selectorsJeroen van Baarsen2014-04-152-4/+0
|/
* Merge pull request #6780 from cbordei/hotfix/issue-6615Dmitriy Zaporozhets2014-04-151-1/+1
|\
| * Fixed multiple close issue #6615Cristian Bordei2014-04-151-1/+1
* | Merge branch 'restful-naming' into 'master'Dmitriy Zaporozhets2014-04-151-1/+1
|\ \
| * | Endpoints are for RPC interfaces, we have resources.dosire2014-04-151-1/+1
|/ /
* | Merge branch 'routing-for-groups' into 'master'Dmitriy Zaporozhets2014-04-152-0/+13
|\ \
| * | Fixes to group route tests, thanks DZGitLab2014-04-151-2/+1
| * | Add short path route for groups.GitLab2014-04-132-0/+14
* | | Merge branch 'active-users' into 'master'Dmitriy Zaporozhets2014-04-151-0/+4
|\ \ \
| * | | Add monthly active users to the admin dashboard.GitLab2014-04-151-0/+4
* | | | Merge branch 'prevent-two-links-in-emails' into 'master'Dmitriy Zaporozhets2014-04-151-1/+1
|\ \ \ \
| * | | | Only one link per email to prevent clicking the wrong one.dosire2014-04-021-1/+1
* | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2014-04-152-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update to fix ruby 1.9.3 issue with slack-notifierPaul Badcock2014-04-111-2/+2
| * | | | Update slack to fix issues with ruby 1.9.3Paul Badcock2014-04-111-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6774 from cirosantilli/issue-form-rename-fieldsDmitriy Zaporozhets2014-04-151-2/+2
|\ \ \ \
| * | | | Rename issue form tags to match MR and params.Ciro Santilli2014-04-141-2/+2
* | | | | Merge pull request #6773 from tsigo/rs-tag-page-sortingDmitriy Zaporozhets2014-04-152-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use VersionSorter on the Project > Tags pageRobert Speicher2014-04-142-3/+4
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-145-9/+21
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6761 from jvanbaarsen/fixed-statemachine-warningDmitriy Zaporozhets2014-04-142-3/+14
| |\ \ \ \ \
| | * | | | | Fixed some hound noticesJeroen van Baarsen2014-04-141-2/+4
| | * | | | | Changed default in the database for the statemachineJeroen van Baarsen2014-04-143-4/+13
| | * | | | | Make the db and statemachine default is the sameJeroen van Baarsen2014-04-111-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #6772 from dblessing/commit_counterDmitriy Zaporozhets2014-04-141-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Show actual commit count on project dashboardDrew Blessing2014-04-141-3/+3
| * | | | | Merge pull request #6711 from marciotoze/patch-1Dmitriy Zaporozhets2014-04-141-3/+3
| |\ \ \ \ \
| | * | | | | Update installation.mdMarcio Toze2014-04-091-3/+3
| * | | | | | Merge pull request #6706 from jvanbaarsen/add-dump-rdb-to-ignoreDmitriy Zaporozhets2014-04-141-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Added the dump.rdb file to gitignoreJeroen van Baarsen2014-04-061-0/+1
* | | | | | | Merge branch 'satellite_exists_in_automerge_check' into 'master'Dmitriy Zaporozhets2014-04-142-8/+0
|\ \ \ \ \ \ \
| * | | | | | | Satellite will exist when doing automerge_check.Marin Jankovski2014-04-112-8/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'speed_up_wiki_pages' into 'master'Dmitriy Zaporozhets2014-04-143-5/+8
|\ \ \ \ \ \ \
| * | | | | | | Speed up loading and add pagination to wiki pages page.Marin Jankovski2014-04-113-5/+8
| |/ / / / / /
* | | | | | | Merge branch 'simple-pointers-in-readme' into 'master'Dmitriy Zaporozhets2014-04-141-0/+6
|\ \ \ \ \ \ \
| * | | | | | | List the next steps.dosire2014-04-131-0/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'link-to-oauth-doc' into 'master'Dmitriy Zaporozhets2014-04-141-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Link to the doc.dosire2014-04-101-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '100k' into 'master'Sytse Sijbrandij2014-04-142-2/+2
|\ \ \ \ \ \ \
| * | | | | | | 100k organizations use GitLab.dosire2014-04-142-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'postgres_installation' into 'master'Sytse Sijbrandij2014-04-141-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Be more specific about when to edit database.ymlJacob Vosmaer2014-04-091-1/+1
| * | | | | | | No need to edit database.yml for standard PostgresJacob Vosmaer2014-04-091-6/+7
* | | | | | | | Merge branch 'add_patch_release_doc' into 'master'Sytse Sijbrandij2014-04-142-7/+26
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update security document with the link to patch document.Marin Jankovski2014-04-142-7/+2