home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,886 Commits 48 Branches 340 Tags
7d45d8a14e25d752b8763736bb2b9efba033da55
Commit Graph
11886 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 7d45d8a14e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-30 12:16:27 +02:00
Dmitriy Zaporozhets be34477d68 Merge branch 'backup_uploader_docs' into 'master' 
Improve backup uploader docs

See merge request !1137
 2014-09-30 10:08:53 +00:00
Jacob Vosmaer f778387e38 Add region to backup upload config in gitlab.yml 2014-09-30 12:05:07 +02:00
Jacob Vosmaer b5d2d3d799 Consolidate the IAM backup upload policy 2014-09-30 12:03:44 +02:00
Jacob Vosmaer 794078a32a Add a 'region' to the backup upload connection 2014-09-30 12:03:36 +02:00
Dmitriy Zaporozhets adc84bf8b4 Merge pull request #7906 from mr-vinn/fix-graph-log 
Replace Gitlab::Git::GitStats
 2014-09-30 12:19:05 +03:00
Dmitriy Zaporozhets 0c29cb3451 Merge branch 'jubianchi-api/issues-filter-milestone' 2014-09-30 12:18:07 +03:00
Dmitriy Zaporozhets 4c52ff5184 Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-30 12:17:57 +03:00
Dmitriy Zaporozhets c20c2c8385 Merge branch 'fix-network-graph' into 'master' 
Fix network graph

Fix #1624

See merge request !1135
 2014-09-30 08:57:37 +00:00
Dmitriy Zaporozhets 3f739428a0 Merge branch 'prevent_notes_polling' into 'master' 
Prevent notes polling when there are not notes

See merge request !1132
 2014-09-30 08:57:21 +00:00
Dmitriy Zaporozhets e145f46a93 Fix contributors api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:56:48 +03:00
Dmitriy Zaporozhets 5601b87b31 Bump gitlab_git version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:34:19 +03:00
Robert Schilling 57c0d9ec46 Merge pull request #7870 from mr-vinn/fix-notify-spec 
Update expected value in notify_spec
 2014-09-30 07:53:46 +02:00
Robert Schilling 5b5912f917 Merge pull request #7889 from cirosantilli/rm-def-project 
Remove def project from tests that inherit it.
 2014-09-30 07:42:30 +02:00
Vinnie Okada 31abf76840 Replace Gitlab::Git::GitStats 
The `GitStats` class has been removed from gitlab_git, so parse commits
directly in `Repository#graph_log`.
 2014-09-29 22:58:21 -05:00
Dmitriy Zaporozhets efcac2befc Merge pull request #7873 from cirosantilli/testme-to-gitlabtest 
Replace testme with gitlab-test.
 2014-09-29 19:49:59 +03:00
Jacob Vosmaer 693cee89f9 Prevent notes polling when there are not notes 2014-09-29 17:32:56 +02:00
Dmitriy Zaporozhets 9654cbb592 Merge branch 'backup-uploader' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-29 18:20:21 +03:00
Dmitriy Zaporozhets 804b25956e Merge branch 'protect_default_branch_by_default' into 'master' 
Protect default branch by default

Fixes #1543

See merge request !1130
 2014-09-29 15:16:15 +00:00
Dmitriy Zaporozhets 4e5989ea68 Merge branch 'keep_repositories_directory' into 'master' 
Keep repositories directory

See merge request !1131
 2014-09-29 15:12:50 +00:00
Dmitriy Zaporozhets 6a7622b2a8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-29 18:11:00 +03:00
Dmitriy Zaporozhets 331a4675fe Fix download repo featire 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 18:10:41 +03:00
Jacob Vosmaer 51f8352dca Keep tmp/repositories during clean-up 2014-09-29 17:02:45 +02:00
Dmitriy Zaporozhets 813e272896 Merge branch 'faster-branch-contains' into 'master' 
Faster branch contains detection for commit

Much faster then iterate over all branches in rugged and look for existing commit

See merge request !1129
 2014-09-29 14:53:54 +00:00
Dmitriy Zaporozhets 2d842b61af Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-29 17:48:31 +03:00
Dmitriy Zaporozhets 0a1176d62d Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed 
Add predictable merge requests on dev seed.
 2014-09-29 17:46:08 +03:00
Dmitriy Zaporozhets 35152e3c56 Merge pull request #7895 from cirosantilli/quiet-admin-dev-seed 
Prevent email sending on admin dev seed.
 2014-09-29 17:43:58 +03:00
Dmitriy Zaporozhets 3dc9a67c2a Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binary 
Only show text wrap and diff notes for text in merge requests.
 2014-09-29 17:43:00 +03:00
Dmitriy Zaporozhets 8163a43c8f Merge pull request #7862 from cirosantilli/test-change-file 
Add web UI file CRUD tests.
 2014-09-29 17:38:22 +03:00
Sytse Sijbrandij 221210a524 Merge branch 'imp-gitflow' into 'master' 
Improve gitflow article

See merge request !195
 2014-09-29 14:24:10 +00:00
Job van der Voort 17ad28f3c6 resize large picture in git flow article 2014-09-29 16:13:02 +02:00
Job van der Voort 09352d1f04 add new images to gitflow article and space them 2014-09-29 16:10:32 +02:00
Marin Jankovski ab6459ad48 Add a simple spec test. 2014-09-29 16:07:53 +02:00
Dmitriy Zaporozhets 36d7e18f4a Add specs for Repository#last_commit_for_path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:45:16 +03:00
Dmitriy Zaporozhets 88b1e0ffcd Faster branch contains detection for commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:40:13 +03:00
Sytse Sijbrandij cc778b0a27 Merge branch 'gitlab-flow' into 'master' 
Gitlab flow

This article describes the best practices we use at GitLab B.V.
This is still a draft, please comment and submit improvements.

See merge request !176
 2014-09-29 13:31:45 +00:00
Sytse Sijbrandij 15f01b6a85 Merge branch 'gitlab-flow' of gitlab.com:gitlab-org/gitlab-ce into gitlab-flow 2014-09-29 15:30:17 +02:00
Sytse Sijbrandij 4df15fe33e Merge branch 'master' into gitlab-flow 
Conflicts:
	CONTRIBUTING.md
 2014-09-29 15:21:34 +02:00
Marin Jankovski fbc6f95a02 Protect default branch by default. 2014-09-29 15:12:07 +02:00
Jacob Vosmaer e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02:00
Ciro Santilli da4eff4add Only show text wrap and diff notes for text in MR. 2014-09-29 14:48:05 +02:00
Dmitriy Zaporozhets 2ebd2d41a5 Merge branch 'faster-rev-list' into 'master' 
Faster rev list

Since rugged does not support path filtering yet it affects GitLab performance.
So we use `git rev-list` as temporary but fast and reliable solution for looking last commit of tree

Fixes #1622

See merge request !1127
 2014-09-29 12:26:51 +00:00
Ciro Santilli 1ba26184eb Add predictable merge requests on dev seed. 2014-09-29 13:55:31 +02:00
Dmitriy Zaporozhets 44bc5fe5d6 Improve commits data loading on Tree page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 14:40:36 +03:00
Ciro Santilli a963e8c293 Prevent email sending on admin dev seed. 2014-09-29 13:38:54 +02:00
Job van der Voort 5121fce196 update ci mr image with smaller screenshots 2014-09-29 13:38:43 +02:00
Sytse Sijbrandij 0e8e9e5d77 Merge branch 'omnibus-words' into 'master' 
Omnibus words

As discussed:

We want to standarize the words 'omnibus package' to avoid (apparent) confusion regarding the installation and setup methods.

See merge request !1126
 2014-09-29 10:58:38 +00:00
Job van der Voort 8b17bdaafc capitalize omnibus in docs 2014-09-29 12:55:15 +02:00
Dmitriy Zaporozhets 376e004c16 Merge branch 'issue-box-redesign' into 'master' 
Issue box redesign

I complained before about the issue box looks. This is a proposed redesign.

The background of the issue is slightly lighter than the comments, so there is a clear distinction.

To make sure the issue then doesn't disappear, the shadow is slightly strongly (but still barely noticeable, to keep it flat).

The left top corner is round to highlight the status 'label', as it were a real label.

See merge request !1125
 2014-09-29 10:19:23 +00:00
Dmitriy Zaporozhets 91d30c9002 Merge branch 'refactor-graphs' into 'master' 
Improving graphs: add new commits graphs page

This MR adds new page to graphs sections with commits statistic

![Screenshot 2014-09-26 20.32.01](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/61fd84c4d6/Screenshot_2014-09-26_20.32.01.png)

See merge request !1124
 2014-09-29 10:16:17 +00:00