home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,907 Commits 48 Branches 340 Tags
2dbf1a00a91b98f639212b46efdcbe60484e4483
Commit Graph
9907 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 2dbf1a00a9 Ruby 2.0+ is a requirement. 2014-05-29 10:15:14 +02:00
Dmitriy Zaporozhets ce498eed9a Add stuff to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 20:18:25 +03:00
Dmitriy Zaporozhets 13cbc82aa1 Merge branch 'master-create-group-projects' into 'master' 
Master can create group projects

It also includes Project transfer refactoring

Fixes #1284
 2014-05-28 17:12:28 +00:00
Dmitriy Zaporozhets 64b1956b0b Merge pull request #7032 from erbunao/markdown_clipboard 
Implements clipboard feature for markdown areas.
 2014-05-28 19:54:44 +03:00
Dmitriy Zaporozhets cea0fc1de8 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:33:49 +03:00
Dmitriy Zaporozhets 1932f902d5 Allow masters to create projects in groups 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:42 +03:00
Dmitriy Zaporozhets 14f78d067d Modify specs for new project transfer code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:18 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
Dmitriy Zaporozhets aea79b8035 Add ability rule for creating project in namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:01 +03:00
Dmitriy Zaporozhets aca6be50d3 Refactor project transfer service. Add security check when create or transfer project into group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:02:26 +03:00
Dmitriy Zaporozhets 6ba4cb1d2b Remove old rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:01:19 +03:00
erbunao 2273234653 Implements and refactors clipboard feature for markdown. 2014-05-28 22:51:47 +08:00
Dmitriy Zaporozhets 260c877cab Merge branch 'render_org_files' into 'master' 
Render org files

Fixes #1215
 2014-05-28 14:09:39 +00:00
Dmitriy Zaporozhets 10fad7b0ab Merge branch 'link-to-installation-options' into 'master' 
Link to installation options
 2014-05-28 14:08:59 +00:00
Dmitriy Zaporozhets 5580dc999b Merge branch 'backport-ci-service' into 'master' 
Backport CI service refactoring from EE

It allows easier contribution of different CI services.
Fixes #1280
 2014-05-28 14:05:00 +00:00
dosire 59f68b1b9f Link to installation page. 2014-05-28 15:26:25 +02:00
Marin Jankovski 666260bf6b Add changelog for version to 6.9.1. 
Conflicts:
	CHANGELOG
	VERSION
 2014-05-28 13:04:57 +02:00
Sytse Sijbrandij c183019ce1 Merge branch 'use_newer_git_version' into 'master' 
Use newer git version

Fixes #1272
 2014-05-28 11:01:55 +00:00
Marin Jankovski 82855e078f Keep the lowest requirement for git in the documentation. 2014-05-28 12:53:10 +02:00
Marin Jankovski dc158af665 Add org-ruby for rendering .org files. 2014-05-28 12:23:03 +02:00
Dmitriy Zaporozhets a3db7631b8 Fix haml indent 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 12:52:02 +03:00
Dmitriy Zaporozhets 8a3807c838 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 12:40:22 +03:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Dmitriy Zaporozhets 49c50ee868 Merge branch 'gitlab-shell-upgrade-might-be-required' into 'master' 
Gitlab shell upgrade might be required

Also got rid of `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production` since gitlab:check is more important.
 2014-05-28 07:37:46 +00:00
dosire ca907e4f9f Make it more obvious that GitLab Shell should be upgraded. 2014-05-28 09:28:39 +02:00
Dmitriy Zaporozhets 6bd114a700 Merge branch 'remove-branch-btn' into 'master' 
Don't show remove branch button if you are not allowed to remove it

Fixes #1213
 2014-05-27 18:49:18 +00:00
Dmitriy Zaporozhets 3682e72619 Merge branch 'move_script_to_bin' into 'master' 
Move script to bin

Fixes #925
 2014-05-27 17:03:34 +00:00
Dmitriy Zaporozhets affd376f7a Dont show remove source branch ckecbox/button if you dont have such 
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 18:51:41 +03:00
Dmitriy Zaporozhets d25bc25766 Merge branch 'gitlab_shell_in_upgrader_guide' into 'master' 
Gitlab shell in upgrader guide

Fixes #1214
 2014-05-27 15:34:47 +00:00
Dmitriy Zaporozhets 19ea36227a Merge branch 'add_titles_to_help_pages' into 'master' 
Add titles to help pages

Fixes #1183
 2014-05-27 15:33:15 +00:00
Dmitriy Zaporozhets c862bc6fcf Merge branch 'ldap_user_filter_fix' into 'master' 
LDAP user filter fix
 2014-05-27 15:32:41 +00:00
Marin Jankovski 2341cefd6f Move from script to bin directory. 2014-05-27 17:14:41 +02:00
Marin Jankovski cb4b504b26 Merge branch 'merge-patch-changelog-back-into-master' into 'master' 
Merge patch changelog back into master

/cc @dzaporozhets
 2014-05-27 14:39:38 +00:00
Marin Jankovski cee88509a3 Fix typo in text. 2014-05-27 16:30:39 +02:00
Jacob Vosmaer 7dfb678df9 Revert "Actually use the 'user_filter' configuration option" 
This reverts commit e9d4587ff1, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
 2014-05-27 15:53:04 +02:00
dosire c8b58f0007 Cherry-pick the changelog additions into master. 2014-05-27 14:56:52 +02:00
Marin Jankovski 046647a746 Add directions on how to upgrade gitlab-shell in the upgrader guide. 2014-05-27 14:25:34 +02:00
Marin Jankovski f22c709539 Add titles to doc pages. 2014-05-27 14:12:15 +02:00
Dmitriy Zaporozhets 3bdf0e2921 Merge branch 'compare-api' into 'master' 
Compare api

Fixes #1165
 2014-05-27 11:16:07 +00:00
Marin Jankovski e101369994 Use newer version of git in installation doc. 2014-05-27 13:06:20 +02:00
Marin Jankovski 3553e36d16 Merge branch 'review-changelog' into 'master' 
Review changelog

@dzaporozhets updates the changelog and notifies the team.
 2014-05-27 10:35:35 +00:00
Dmitriy Zaporozhets b60226abf5 Merge branch 'improve-mr-tabs' into 'master' 
Improve merge request page UX

Increase Discussions and Changes tabs size. Added count of changes and comment to it

Before and after:

![Screenshot 2014-05-27 12.08.42](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/31fe70c9be/Screenshot_2014-05-27_12.08.42.png)
 2014-05-27 10:08:34 +00:00
Dmitriy Zaporozhets d7b3bbfc4a Make MR dicussion and changes tabs more noticable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 12:06:31 +03:00
Dmitriy Zaporozhets c7e00aca2d Better specs for Compare API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:27:42 +03:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:16:50 +03:00
Marin Jankovski f4889f50fc Add entry to changelog. 2014-05-27 08:58:26 +02:00
Dmitriy Zaporozhets e918ae240e Merge branch 'no_link_inside_code_block' into 'master' 
No link inside code block
 2014-05-27 06:26:22 +00:00
Dmitriy Zaporozhets 7c5d96cf52 Merge branch 'improve-gitlab-test' into 'master' 
Improve rake test

Check for `system` call return value instead of `$?.exitstatus`
 2014-05-27 06:00:38 +00:00
Dmitriy Zaporozhets aef2122f81 Merge branch 'css-truncation' into 'master' 
CSS truncation

Use css truncation for event titles on dashboard. Fix vertical align of timestamps
 2014-05-27 05:13:06 +00:00
Dmitriy Zaporozhets 1e7fa8d99b Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 08:12:03 +03:00