home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,883 Commits 48 Branches 340 Tags
49c50ee868cc355ae8d748ec67fce2e01311697f
Commit Graph
9883 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Dmitriy Zaporozhets c9020ae586 Fix test.rake 2014-05-26 20:30:45 +00:00
Dmitriy Zaporozhets c456231690 Use css truncation on dashboard 2014-05-26 23:26:41 +03:00
Dmitriy Zaporozhets e426d43924 Check return system value for gitlab test rake tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 21:54:57 +03:00
Marin Jankovski 281643a1bf Add feature spec. 2014-05-26 20:43:58 +02:00
Marin Jankovski 603e04bc21 Make sure slashes are handled properly. 2014-05-26 20:43:58 +02:00
Marin Jankovski 52c3179be9 Do not replace links inside code blocks, less code for the same amount of work. 2014-05-26 20:43:58 +02:00
Dmitriy Zaporozhets 7ad5fb53ac Merge branch 'push-release-doc' into 'master' 
Push release doc
 2014-05-26 18:43:51 +00:00
Dmitriy Zaporozhets f48658813c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-26 21:38:41 +03:00
Dmitriy Zaporozhets 21649cabdd Merge branch 'fix/drag_and_drop_image_tests' into 'master' 
Fix drag and drop image tests
 2014-05-26 18:38:05 +00:00
Dmitriy Zaporozhets e03a2fa2d1 Merge branch 'email-hint' into 'master' 
Email hint

After this is merged decline http://feedback.gitlab.com/forums/176466-general/suggestions/5767472-move-actionmailer-sending-method-and-smpt-settings
 2014-05-26 18:35:49 +00:00
Dmitriy Zaporozhets c267d183ba Merge branch 'test-ee' into 'master' 
Test ee
 2014-05-26 18:35:13 +00:00
dosire b2ec09e5d6 Specify what version to test manually. 2014-05-26 17:09:31 +02:00
Dmitriy Zaporozhets 242291850d Add some tests to compare api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 18:05:55 +03:00
dosire 040b3be5b1 Give a hint where to find the email settings. 2014-05-26 16:15:12 +02:00
Marin Jankovski 9b2a13497d Need txt file in test. 2014-05-26 15:58:03 +02:00
Marin Jankovski 43e7b8fa07 Remove empty space 2014-05-26 15:55:41 +02:00
dosire fe10f37199 Add default arguments, name gitlab repo gl, suggest dotfile repo. 2014-05-26 15:54:06 +02:00
Marin Jankovski f8a6d3405e Add image_service spec. 2014-05-26 15:47:54 +02:00
dosire c7a5530930 Small layout improvements. 2014-05-26 15:40:44 +02:00
dosire 75e90cb456 Push to all remotes doc. 2014-05-26 15:38:18 +02:00
Dmitriy Zaporozhets f441436e53 Add compare branches endpoint to API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 16:08:22 +03:00
Marin Jankovski 3b2b3cff04 Move logic to image_service. 2014-05-26 14:54:03 +02:00
Sytse Sijbrandij 13233d6d1e Merge branch 'regression-issue' into 'master' 
Regression issue

We want to aid communication between the issue tracker team and the release manager with this.

A first example of this issue is https://gitlab.com/gitlab-org/gitlab-ce/issues/294
 2014-05-26 12:18:37 +00:00
Marin Jankovski 8bec6b0bcb Make existing tests test something, return correct errors. 2014-05-26 14:17:46 +02:00