home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,325 Commits 48 Branches 340 Tags
b6a609edbc1e46c72980b577e482b76f85dd39fc
Commit Graph
8325 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets b6a609edbc Truncate long names for admin dashboard with css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-15 13:35:20 +02:00
Dmitriy Zaporozhets 5cf5c177df Merge branch 'add-margin-to-resend-form' into 'master' 
Add Margin to Resend Confirmation Form

I fixed this issue on the "Reset Password"-form (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20), but found it is also occuring on the "Resend Confirmation"-form. There currently is no margin between the input (email-address) and button. This commit is a simple fix.
 2014-02-14 17:26:23 +00:00
Jacob Vosmaer bbf8fd2ee4 Merge branch 'environmentize-scripts-in-script-dir' into 'master' 
Environmentize Scripts In Script Dir

Updated Rails.root/scripts/{web,background_jobs} to use #!/usr/bin/env bash to allow for less OS specifcs for the location of bash, namely FreeBSD or Systems that have bash installed from source but do not have the path exported for /usr/local/{bin,sbin}
 2014-02-14 15:45:32 +00:00
Pixelindustries c187d27955 Added margin between form and button in resend-confirmation form. 2014-02-14 15:45:41 +01:00
Dmitriy Zaporozhets 0331f36a2c Few responsive fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-14 15:58:15 +02:00
Dmitriy Zaporozhets e19ff109a2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-14 15:52:15 +02:00
Dmitriy Zaporozhets 9ca80048a2 Merge branch 'add-margin-to-reset-password-form' into 'master' 
Add Margin To Reset Password Form

There currently is no margin between the reset-password input (email-address) and button. This is ugly. This commit is a simple fix.
 2014-02-14 13:50:16 +00:00
Dmitriy Zaporozhets 654d876c86 More changelog entries 2014-02-14 13:42:17 +00:00
Dmitriy Zaporozhets 4c78bc0d83 Merge branch 'https-readme' into 'master' 
Https Readme
 2014-02-14 13:36:54 +00:00
dosire aa618dd87d Prevent mixed content warnings. 2014-02-14 14:28:49 +01:00
Dmitriy Zaporozhets fe6c534d47 Merge branch 'master' of github.com:gitlabhq/gitlabhq v6.6.0.pre1 2014-02-14 15:13:58 +02:00
Dmitriy Zaporozhets f745c6e5b5 Merge branch 'improve_large_groups' into 'master' 
Improve for large groupsImprove for large groups

This merge request is a set of patched to improve application for large groups with more then 100 people.

Pages to be improved:
✅ Group#members page
✅ Project#issues page
✅ Project#merge_requests page
✅ Project#new_issue page
✅ Project#new_mr page
✅ Project#members page
 2014-02-14 13:13:42 +00:00
Sytse Sijbrandij 8cf4aef05d Merge pull request #6314 from jvanbaarsen/patch-2 
Update readme.md
 2014-02-14 12:52:38 +01:00
Dmitriy Zaporozhets fd12e5c604 Dont render more than 20 group members on Project#members page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-14 12:42:08 +02:00
Dmitriy Zaporozhets ea1e92a0b6 Use project_users_select_tag for Issue form and MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-14 12:30:12 +02:00
Dmitriy Zaporozhets 361a8781c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-14 12:14:07 +02:00
Dmitriy Zaporozhets 66d21d54f3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-14 12:13:59 +02:00
Dmitriy Zaporozhets 205abf220e Merge branch 'feature/email-aliases' into 'master' 
Add email aliases for users
Email aliases are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis.
This addresses http://feedback.gitlab.com/forums/176466-general/suggestions/3692666-ability-to-have-multiple-email-address.
 2014-02-14 07:35:05 +00:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
Sytse Sijbrandij 5e935bfec6 Merge pull request #6315 from jvanbaarsen/fix-6311 
Fixes #6311: cp the init.d file locally instead of remote
 2014-02-13 21:17:21 +01:00
Jeroen van Baarsen 5ed87ab7cc Fixes #6311: cp the init.d file locally instead of remote 2014-02-13 21:14:20 +01:00
Jeroen van Baarsen 009858bf4b Update readme.md 
Changed `Gitter` to `Gitter chat room`
 2014-02-13 20:59:45 +01:00
Sytse Sijbrandij 78363222ba Merge pull request #6310 from jvanbaarsen/add-gitter-link 
Added gitter link
 2014-02-13 20:45:02 +01:00
Dmitriy Zaporozhets 0212bc7a0d Merge branch 'remove-backtics-in-anchor-text' into 'master' 
Remove Backtics In Anchor Text
 2014-02-13 18:54:01 +00:00
Dmitriy Zaporozhets 9b5728057e Restyle issue/mr top filters for list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 19:59:09 +02:00
Dmitriy Zaporozhets 67798492bc Add placeholder support for project_users_select_tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:16:23 +02:00
Dmitriy Zaporozhets f0f88390c1 project_user selectbox with ajax autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 1d48904ac8 Show avatars in ajax user selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 15:45:24 +02:00
Sytse Sijbrandij 56a5bc690d Merge branch 'mr_workflow' into 'master' 
Add documentation for MR workflow
 2014-02-13 13:39:13 +00:00
Jacob Vosmaer cf9c8e7382 Explanation MR workflow and authorization 2014-02-13 14:25:43 +01:00
Dmitriy Zaporozhets 71a39655b4 Merge pull request #6258 from zzet/patch-6 
Add emoji images to asset load path.
 2014-02-13 14:59:33 +02:00
Jeroen van Baarsen 9d8c8275f8 Added gitter link 2014-02-13 13:30:06 +01:00
Dmitriy Zaporozhets abb3121308 Show only people who have assigned merge requests in assignee dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 13:59:07 +02:00
Dmitriy Zaporozhets 13ecbb04bc Show only people who have assigned issues in assignee dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 13:57:11 +02:00
Dmitriy Zaporozhets 0f134e54dd Fix group test for new member add procedure 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 11:06:35 +02:00
Dmitriy Zaporozhets af9d7fafa9 Adopt Group#members page for large groups (> 100 users) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 11:00:44 +02:00
Dmitriy Zaporozhets d41e404e09 Merge pull request #6274 from cirosantilli/leave-group-from-members-page 
User can leave group from group page.
 2014-02-13 09:44:03 +02:00
Marin Jankovski bccc2729ef Update minor version upgrade guide get latest code section. 2014-02-12 17:42:56 +01:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
dosire a36f5730b0 Backticks are just confusing here. 2014-02-12 15:45:36 +01:00
Dmitriy Zaporozhets 0949c01093 Merge branch 'markdown-styles' into 'master' 
Markdown Styles
 2014-02-12 14:00:09 +00:00
dosire 36462d77b5 Markdown styles dependencies are optional. 2014-02-12 14:49:31 +01:00
Dmitriy Zaporozhets 80f34cfbc7 Merge branch 'remove-gem-button' into 'master' 
Remove Gem Button
 2014-02-12 13:10:20 +00:00
dosire 0e90ff8018 Gemnasium makes us red even though we are not exposed to a JRuby bug. 2014-02-12 14:02:50 +01:00
Dmitriy Zaporozhets c86553cd83 Merge branch 'refactor_compare' into 'master' 
Refactor Compare logic

Updated gitlab_git to version 5.4.0.
Fixes MR diff download link in case of huge diff.
Fixes #1026
 2014-02-12 12:51:35 +00:00
Dmitriy Zaporozhets ddbb3c3016 Merge branch 'markup-dependencies' into 'master' 
Markup Dependencies
 2014-02-12 11:05:14 +00:00
Dmitriy Zaporozhets 70df605535 Fix link for MR diff download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 13:03:32 +02:00
Dmitriy Zaporozhets 59769fdb94 Improve compare logic for EmailOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:56:13 +02:00
Dmitriy Zaporozhets 0bcabdaf83 Use gitlab_git 5.4.0 without BROKEN_DIFF constant 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:54:49 +02:00
dosire abb6204de8 Add information about rich text format dependencies. 2014-02-12 09:45:34 +01:00