home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,608 Commits 48 Branches 340 Tags
058c48845bf64f09a2bf7bb475f51fad77e4eee1
Commit Graph
9608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 058c48845b Merge branch 'fix_merge_request_emails' into 'master' 
Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5 and it was recently changed back to use the markdown style.
 2014-05-08 18:36:32 +00:00
Dmitriy Zaporozhets 8c1201efac Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-08 21:31:43 +03:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit 
submit notes forms by pressing ctrl+enter
 2014-05-08 21:31:25 +03:00
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00
Dmitriy Zaporozhets cb20ab0201 Merge pull request #6929 from asedge/fix_api_branches_with_periods 
Add fix for API when branch names have periods in them.  Relates to issu...
 2014-05-08 21:22:13 +03:00
Dmitriy Zaporozhets 1ba865c6a6 Merge branch 'master' into 'master' 
Added Laravel API Wrapper
 2014-05-08 18:21:49 +00:00
Dmitriy Zaporozhets 4d11a3d8cd Merge pull request #6941 from jvanbaarsen/typo-fix 
Fix a minor typo in the README
 2014-05-08 21:21:13 +03:00
Dmitriy Zaporozhets 5218537c3b Merge branch 'rails_4_0_5' into 'master' 
Rails 4.0.5
 2014-05-08 17:30:43 +00:00
Dmitriy Zaporozhets e5de006845 Merge branch 'tar_version_encoding' into 'master' 
Fix tar version string encoding bug
 2014-05-08 16:24:16 +00:00
Jacob Vosmaer da347d1bb4 Apply the locale encoding to tar --version 
Fixes a bug with non-UTF8 locales introduced by
2b816075dc.
 2014-05-08 18:23:44 +02:00
Dmitriy Zaporozhets 41231862ba Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:23:39 +03:00
Dmitriy Zaporozhets 4917dc6469 Merge branch '2-step-mr' into 'master' 
2 step merge request process
 2014-05-08 16:11:03 +00:00
Dmitriy Zaporozhets 536373ad05 Dont allow mr compare with empty branches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:00:03 +03:00
Dmitriy Zaporozhets 4673d980a0 Merge branch 'convert_backup_to_postgres' into 'master' 
Convert MySQL backup to Postgres
 2014-05-08 15:02:58 +00:00
Dmitriy Zaporozhets 6af6f4b46a Merge branch 'update_gitlab_grit' into 'master' 
Update gitlab grit version
 2014-05-08 15:01:38 +00:00
Dmitriy Zaporozhets 86bf684f5d Minor UI improvements and fixed test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 16:30:39 +03:00
Marin JankovskiandJacob Vosmaer ad5a982d84 Update sass-rails with newer version of rails. 2014-05-08 15:28:07 +02:00
Jeroen van Baarsen 700b6366db Fix a minor typo in the README 2014-05-08 14:57:42 +02:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:52:59 +03:00
Dmitriy Zaporozhets ee3cd06f4c Remove unnecessary css margin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:40:19 +03:00
Dmitriy Zaporozhets 51e976d295 Add assignee/milestone block to merge request edit page. And remove branches selector from this page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:40:02 +03:00
Dmitriy Zaporozhets 8eae01ea58 Compare branches in MergeRequestsController#new action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:52 +03:00
Dmitriy Zaporozhets 05e63fe09c MergeRequest#new 2 step process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:17 +03:00
Dmitriy Zaporozhets 23de3551ab Add MergeRequest#target_project_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:37:36 +03:00
Jacob Vosmaer 5014a5b7d5 Update rails to 4.0.5 2014-05-08 13:59:31 +02:00
Jacob Vosmaer 3bfbea37e9 Indicate when to stop/start GitLab 2014-05-08 13:18:22 +02:00
Jacob Vosmaer 92591b63dc Add an introcudtion to mysql_to_postgresql.md 2014-05-08 13:18:12 +02:00
Sean Edge da9b009d31 Add fix for API when branch names have periods in them. Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128). 2014-05-08 07:06:47 -04:00
Jacob Vosmaer c01efa0ed5 Document how to convert a backup to PostgreSQL 2014-05-08 12:12:14 +02:00
Marin Jankovski 5f74f0511f Update gitlab-grit to 2.6.6. 2014-05-08 09:13:41 +02:00
Dmitriy Zaporozhets 3dea71ce0f Merge branch 'satellite-diff-collector' into 'master' 
Add CompareAction class for collecting commits and diffs using satellites
 2014-05-07 18:41:18 +00:00
skv-headless a8624cbe59 submit notes forms by pressing ctrl+enter 2014-05-07 17:50:56 +04:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Dmitriy Zaporozhets dd3a55064e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-07 14:57:26 +03:00
Dmitriy Zaporozhets e652a753c0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-07 14:55:56 +03:00
Dmitriy Zaporozhets bcfa62b6a6 Merge branch 'ui-fixes' into 'master' 
Ui fixes

* Fix merge request widget UI
* Improve jquery UI
* truncate long branch names on MR index
 2014-05-07 11:55:21 +00:00
Dmitriy Zaporozhets 97eb2240b1 Fix check-all issues checkbox position 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:52:43 +03:00
Dmitriy Zaporozhets 136683b144 Merge pull request #6928 from ahmedshafeeq/patch-2 
Remove extra "Compile assets" section
 2014-05-07 14:48:23 +03:00
Dmitriy Zaporozhets 02ae038c57 Merge branch 'fix_test' into 'master' 
Fixes failing test
 2014-05-07 11:44:56 +00:00
Dmitriy Zaporozhets 18529269c6 truncate long branch names on MR index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:43:07 +03:00
Dmitriy Zaporozhets c9104fa6e4 Fix search dropdown css. Improve jquery styles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:26:49 +03:00
Marin Jankovski 99e0d0dd6f Unstub after the test is done. 2014-05-07 11:52:07 +02:00
Dmitriy Zaporozhets fa7d0e3ae0 Fix MR widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 12:21:02 +03:00
Ahmed Shafeeq 14102fd211 Remove extra "Compile assets" section 2014-05-07 01:14:00 +08:00
Dmitriy Zaporozhets a94b06e7b5 Merge branch 'postgres_fix' into 'master' 
Postgres fix. Closes #175
 2014-05-06 15:20:26 +00:00
Dmitriy Zaporozhets 118d06a3e2 Merge branch 'mobile_menu_help' into 'master' 
Fix mobile menu after adding help link

After https://github.com/gitlabhq/gitlabhq/pull/6897 the mobile menu ran off the left side of the screen. I don't see much we can do to squeeze all the items into mobile's width. I think hiding one of the items is acceptable and which is a matter of opinion.  I suggest hiding the user's avatar on mobile but the search icon or help icon would both be options as well. Let me know if you want a different icon hidden on mobile.

[Before Screenshot](https://www.dropbox.com/s/hnfmaln3ilcy0p7/Screen%20Shot%202014-05-02%20at%205.17.28%20PM.png)
[After Screenshot](https://www.dropbox.com/s/3ifxa8gfa12h37h/Screen%20Shot%202014-05-05%20at%204.52.25%20AM.png)
 2014-05-06 15:19:53 +00:00
Dmitriy Zaporozhets e026491d53 Merge pull request #6927 from ahmedshafeeq/patch-1 
Use production for Gitlab shell installation
 2014-05-06 18:07:25 +03:00
Ahmed Shafeeq 536b2f2f75 Use production for Gitlab shell installation 2014-05-06 22:02:21 +08:00
Dmitriy Zaporozhets 5ce1418406 Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr 
Fix missing lines in Parallel Diff
 2014-05-06 15:34:33 +03:00
Sytse Sijbrandij aefdac00a2 Merge pull request #6716 from pkgr/pkgr 
Automatically generate debian package with pkgr.io
 2014-05-06 14:32:10 +02:00