home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,806 Commits 48 Branches 340 Tags
cb0d63b9e3fa464ae8c0cd9cf7bdb8d080a7e02f
Commit Graph
10806 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets cb0d63b9e3 Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoring 
Moved some behaviour to one place
 2014-07-26 19:33:18 +03:00
Dmitriy Zaporozhets 8734a9cde8 Merge branch 'most-starred' into 'master' 
Most starred projects page

Fixes #1461

See merge request !996
 2014-07-26 13:51:54 +00:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-26 10:33:42 +03:00
Jeroen van Baarsen 16eea49277 Moved some behaviour to one place 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-25 22:23:42 +02:00
Dmitriy Zaporozhets 974b5a7b2f Most starred projects page for Explore area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-25 22:05:23 +03:00
Dmitriy Zaporozhets 76af5a1db7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-25 20:40:23 +03:00
Dmitriy Zaporozhets 5a89b61028 Merge branch 'exim-problems' into 'master' 
Exim problems

After merge report back to https://github.com/gitlabhq/gitlabhq/issues/4866

See merge request !990
 2014-07-25 15:11:47 +00:00
Dmitriy Zaporozhets 42632de3fb Merge branch 'project-services-explained' into 'master' 
Project services explained

See merge request !993
 2014-07-25 15:10:58 +00:00
Sytse Sijbrandij 83b40ba268 Explain project services. 2014-07-25 13:47:11 +02:00
Jacob Vosmaer e0cdb8a361 Merge branch 'backup-settings-warning' into 'master' 
Backup settings warning

Fixes #1457

See merge request !992
 2014-07-25 09:49:24 +00:00
Sytse Sijbrandij ead2dc0c21 Add warning about backing up the config. 2014-07-25 11:12:17 +02:00
Sytse Sijbrandij 1a2a193135 Merge branch 'word-requirement-a-bit-more-realistic' into 'master' 
Word requirement a bit more realistic

See commit message

See merge request !155
 2014-07-25 08:57:56 +00:00
Dmitriy Zaporozhets 414afd68f3 Merge branch 'improve-star-ui' into 'master' 
Improve star ui

* move star button to sidebar (where other buttons are)
* it fixes overflow issue for screens smaller then 1200px
* it fixes wrong vertical align for star button at old position
* add forks count too - so it looks similar with stars

Fixes #1460

See merge request !991
 2014-07-24 21:17:13 +00:00
Dmitriy Zaporozhets 2d25faf21c Fix star tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 23:25:38 +03:00
Dmitriy Zaporozhets 420ba2119b Move star button to sidebar. Add counter to forks too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 22:14:12 +03:00
Sytse Sijbrandij 14d3f30403 Note exim problems. 2014-07-24 12:00:55 +02:00
Dmitriy Zaporozhets bb80741c24 Mention Explore page in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 12:49:29 +03:00
Dmitriy Zaporozhets c23e1f3d41 Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 12:48:47 +03:00
Dmitriy Zaporozhets 1fd43e1f92 Merge branch 'cirosantilli-star' 2014-07-24 12:42:19 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets 4a1e98e4b6 Merge pull request #6650 from lloeki/wiki_images_attachments 
Added ability to serve files in wiki repository
 2014-07-23 20:28:03 +03:00
Dmitriy Zaporozhets 66098dbb59 Merge pull request #7089 from NARKOZ/api-patch 
API patch
 2014-07-23 20:26:36 +03:00
Dmitriy Zaporozhets 931f27ae32 Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string 
Ensure that uid in OAuth is a string
 2014-07-23 20:26:16 +03:00
Dmitriy Zaporozhets 9e613b91d6 Merge pull request #7318 from jvanbaarsen/constant-warning-fix 
Removed some constant allready defined warnings
 2014-07-23 20:23:08 +03:00
Dmitriy Zaporozhets c29857ac00 Merge branch 'new_user_password_set' into 'master' 
Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973
 2014-07-23 16:44:07 +00:00
Dmitriy Zaporozhets 945dd627fe Merge pull request #7332 from sugarmo/fix-graph-log-timeout 
Fix timeout error when preparing git graph.
 2014-07-23 19:17:41 +03:00
Dmitriy Zaporozhets ed234e344e Merge pull request #7316 from ayr-ton/master 
Add support to set satellites timeout
 2014-07-23 19:17:31 +03:00
Dmitriy Zaporozhets 136ff57211 Merge pull request #7340 from cirosantilli/diff-contrast 
[UI] Increase diff byte highlight contrast.
 2014-07-23 19:13:09 +03:00
Dmitriy Zaporozhets ac9b5bc078 Merge branch '7-2-dev' into 'master' 
Explore area

Fixes #1426

See merge request !987
 2014-07-23 16:01:57 +00:00
Dmitriy Zaporozhets 001096cab8 Remove duplicate test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 18:03:33 +03:00
Dmitriy Zaporozhets 326fb38332 Merge branch 'ruby-rake-check' into 'master' 
Ruby rake check

Fix #1456

See merge request !989
 2014-07-23 14:19:48 +00:00
Dmitriy Zaporozhets a7c5d36493 Merge branch 'improve-release-templates' into 'master' 
Improve release templates

See merge request !985
 2014-07-23 09:35:54 +00:00
Dmitriy Zaporozhets 6992879609 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-23 12:21:35 +03:00
Dmitriy Zaporozhets 2e3b92d776 Merge branch 'fix-for-ruby-1-9' into 'master' 
Fix for ruby 1.9

Fixes #1452

See merge request !988
 2014-07-23 09:21:07 +00:00
Dmitriy Zaporozhets f0bfeb6e33 Refactor explore area tests. Replaced old links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:18:51 +03:00
Dmitriy Zaporozhets 367445fdcd Refactor explore area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:03:49 +03:00
Dmitriy Zaporozhets 059f3a34ac Check ruby version to be >= 2.0.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:44:27 +03:00
Dmitriy Zaporozhets 667f40d271 Force encoding utf-8 for ruby 1.9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:34:28 +03:00
Sytse Sijbrandij 6eb50a69f4 Based on http://www.reddit.com/r/linux/comments/2bffgt/gitlab_71_released/cj59wvz reword this requirement, thankstictatonifonical. 2014-07-23 10:18:41 +02:00
Dmitriy Zaporozhets 1df0345e9e Explore area 
Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:13:33 +03:00
Sytse Sijbrandij 7738383f1b Simplofy the tweet. 2014-07-22 16:36:29 +02:00
Jeroen van Baarsen 561c308e80 Merge pull request #7348 from creativepsyco/patch-1 
Typo fix.
 2014-07-22 14:56:56 +02:00
Mohit Kanwal 0c0b737b1e Typo fix. 2014-07-22 18:20:35 +08:00
Dmitriy Zaporozhets 6b4d5d21be Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-2-dev 2014-07-22 13:19:45 +03:00
Dmitriy Zaporozhets 68a9203bce Version to 7.1.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.1.0 		2014-07-22 09:52:19 +03:00
Dmitriy Zaporozhets 98c66b508c Merge branch 'use_fullpath' into 'master' 
If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982
 2014-07-22 06:50:35 +00:00
Marin Jankovski b421750035 Call store_location_for once. 2014-07-22 08:34:16 +02:00
Dmitriy Zaporozhets 4f47eaf9ae Merge branch 'fix-default-branch' into 'master' 
Fix project default branch change

It is a regression since 7.0. It was caused with switch to `strong_params`.

This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433

See merge request !984
 2014-07-22 06:12:00 +00:00
Dmitriy Zaporozhets af2a6ec150 Add useless test. Uncomment when we improve testing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:52:01 +03:00
Dmitriy Zaporozhets 2a4c73c0a2 Fix project default branch change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:47:41 +03:00