home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,842 Commits 48 Branches 340 Tags
09352d1f040df68bbabcbd0ebaf6b8bb7627ce32
Commit Graph
11842 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort 09352d1f04 add new images to gitflow article and space them 2014-09-29 16:10:32 +02: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
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
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
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
Dmitriy Zaporozhets 83a21c33f1 Add tests for commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:11:53 +03:00
Dmitriy Zaporozhets 3a8cd1fa59 Refactor commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:05:17 +03:00
Job van der Voort 05b3202855 use omnibus package to refer to omnibus gitlab at all times to avoid confusion 2014-09-28 22:56:47 +02:00
Job van der Voort be296633fd redesign issue box to look more soft 2014-09-28 21:23:21 +02:00
Dmitriy Zaporozhets 477214cdc6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-28 17:50:15 +03:00
Job van der Voort 841fc4d95e add screenshots to gitlab-flow article 2014-09-28 15:47:53 +02:00
Job van der Voort 0f35c61dc0 add graphs to git-flow article 2014-09-28 13:59:33 +02:00
Robert Schilling c2c41fb2d3 Merge pull request #7864 from cirosantilli/rm-default-type-submit 
Remove type submit from button_tag since default.
 2014-09-27 11:34:10 +02:00
Robert Schilling 9345ca33b1 Merge pull request #7877 from cirosantilli/empty-nil-blank 
Replace empty? || nil? with blank?.
 2014-09-27 11:28:23 +02:00
Robert Schilling 37a68eab9f Merge pull request #7875 from cirosantilli/patch-6 
Typo indiciated -> indicated.
 2014-09-27 11:22:53 +02:00
Ciro Santilli ac55373ff3 Replace empty? || nil? with blank?. 2014-09-27 11:15:08 +02:00
Ciro Santilli 862315dcb0 Typo indiciated -> indicated. 2014-09-27 10:34:51 +02:00
Dmitriy Zaporozhets 6d0ddf45ba Raw implementation of commits stats page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 20:32:44 +03:00
Dmitriy Zaporozhets e7a3b2c727 Merge branch 'refactor-graphs' into 'master' 
Refactor graphs

This is first step of refactoring graphs. It includes removing all outdated and non-working stuff.

Related to #1590

See merge request !1123
 2014-09-26 16:57:00 +00:00
Dmitriy Zaporozhets aa46a15d2a Fix spinach feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:12:25 +03:00
Dmitriy Zaporozhets 20e0c9b132 Rewrite graphs feature 
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:41 +03:00
Dmitriy Zaporozhets 633d42a335 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:11 +03:00
Ciro Santilli 0cdef83dc8 Remove type submit from button_tag since default. 2014-09-26 16:52:36 +02:00
Dmitriy Zaporozhets fd338d6715 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-26 12:58:20 +03:00
Dmitriy Zaporozhets fedacf52f8 Merge branch 'fix-branch-rm' into 'master' 
Fix branch removal

Fix exception on post-receive worker when remove branch

See merge request !1122
 2014-09-26 09:58:08 +00:00
Dmitriy Zaporozhets 9ecd3bc6ce Improve git_push service specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 12:55:57 +03:00
Dmitriy Zaporozhets 8fae6ad75a Fix typo in push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 12:45:41 +03:00
Robert Schilling de5e0e590f Merge pull request #7835 from cirosantilli/rm-unused-page 
Remove unnecessary page. from tests.
 2014-09-26 10:41:40 +02:00
Robert Schilling f8f0d4478a Merge pull request #7860 from MarkPochert/patch-1 
Update application.js.coffee
 2014-09-26 10:31:34 +02:00
MarkPochert 1be7c25dce Update application.js.coffee 
The require jquery.turbolinks should be before the require turbolinks.

https://github.com/rails/turbolinks => "Add the gem to your project, then add the following line to your JavaScript manifest file, after jquery.js but before turbolinks.js"
 2014-09-26 10:17:26 +02:00
Dmitriy Zaporozhets a932e28ddd Fix worker error when remove branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:55:39 +03:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Dmitriy Zaporozhets 87cf5b7055 Fix GitPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:46:48 +03:00
Dmitriy Zaporozhets 1302dc8f04 Merge branch 'bump-gitlab_git' 2014-09-26 10:33:11 +03:00
Dmitriy Zaporozhets aaaf2bd953 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:30:38 +03:00
Dmitriy Zaporozhets fabe282873 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-26 09:11:22 +03:00
Dmitriy Zaporozhets 46ad546287 Merge branch 'imrpove-filter-dropdown' into 'master' 
Imrpove filter dropdown

Fixes #1617

See merge request !1120
 2014-09-26 06:10:35 +00:00
Dmitriy Zaporozhets b28c1d521f Merge branch 'improve-search-autocomplete' into 'master' 
Improve search autocomplete

Sort search autocomplete projects by stars count so most popular go first.

So when you search for popular project - first result will be this project instead of other forks

Fixes #1404

See merge request !1121
 2014-09-26 06:10:05 +00:00
Robert Schilling e71e8609cf Merge pull request #7859 from Razer6/fix_profile_spelling_error 
Fix spelling error on profile page
 2014-09-26 02:03:31 +02:00
Robert Schilling 53f6f537b0 Fix spelling error on profile page 2014-09-26 01:48:17 +02:00
Dmitriy Zaporozhets 16d530b7b0 Sort projects in search autocomplete by amount of stars. Most popular go first 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:41:49 +03:00
Dmitriy Zaporozhets 810028f3f3 Dont show blocked users in assignee filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:05:27 +03:00
Dmitriy Zaporozhets 143b936300 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-25 18:57:59 +03:00
Dmitriy Zaporozhets d6f04ad831 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 18:57:53 +03:00