home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,811 Commits 48 Branches 340 Tags
8b17bdaafc0fc675bc116a24f7e5ce8a593e38f7
Commit Graph
11811 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort 8b17bdaafc capitalize omnibus in docs 2014-09-29 12:55:15 +02: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
Dmitriy Zaporozhets 477214cdc6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-28 17:50:15 +03: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 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
Dmitriy Zaporozhets 74d4031bbe Minor UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:52:33 +03:00
Jacob Vosmaer 8f0551de05 Merge branch 'master' into 'master' 
Small documentation update, add unixsocketperm

If you run gitlab as user ``git`` while redis runs as user ``redis`` and you add git to ``redis`` group, you'll need to set ``unixsocketperm = 0775`` to grant write access to group.

See merge request !192
 2014-09-25 15:48:45 +00:00
Dmitriy Zaporozhets ae94f59bd5 Merge pull request #7803 from cirosantilli/rm-unused-mr-contributing 
Remove ununsed CONTRIBUTING link on edit MR form.
 2014-09-25 18:45:02 +03:00
Dmitriy Zaporozhets 5040dbfbf8 Merge branch 'improve-flash-message' into 'master' 
Improve flash message

* dont fadeout so user can read
* show inside content block so user can notice it

See merge request !1119
 2014-09-25 15:43:10 +00:00
Dmitriy Zaporozhets 8ebe769f26 Small improvements to code rendering for white highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:40:27 +03:00
Daniel Widerin 99e5e6db73 Remove obsolete line 2014-09-25 15:34:11 +00:00
Daniel Widerin 16a6d2450b Use edit in place with sed instead of tee 2014-09-25 15:24:56 +00:00
Daniel Widerin d5dc171cb7 Path on ubuntu is different 2014-09-25 15:23:40 +00:00
Daniel Widerin b874cb21eb Use 'sed' with pre-search to enable only if present in redis config file. 2014-09-25 15:23:06 +00:00
Dmitriy Zaporozhets 20d6f96928 Improve flash messages 
* dont fadeout so user can read
* show inside content block so user can notice it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:00:21 +03:00
Dmitriy Zaporozhets a6b4e371ee Use gitlab_git v7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 17:25:20 +03:00
Dmitriy Zaporozhets 868755777f Merge branch 'add-bugzilla' into 'master' 
Add bugzilla

See merge request !1114
 2014-09-25 13:59:24 +00:00
Dmitriy Zaporozhets ab729e5c41 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-25 16:58:38 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master' 
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
 2014-09-25 13:58:20 +00:00
Dmitriy Zaporozhets eaeb4a90d4 Fix branch API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:22:08 +03:00
Dmitriy Zaporozhets 66ef5c1aa2 Fix satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:10 +03:00