home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ddaa493ef3 Improve MR building 
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-28 20:54:40 +03:00
Sasha Joseph 37c4ba6f8d Add an option to GET /projects in the GitLab API to exclude archived projects 2014-07-28 12:48:13 -04:00
Dmitriy Zaporozhets 746b7e2da8 Merge branch 'only_redirect_to_referer_from_public' into 'master' 
Only redirect to referrer from public GitLab pages

See merge request !995
 2014-07-28 16:37:04 +00:00
Jacob Vosmaer 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00
Jacob Vosmaer 3a6f9c093e Only redirect to referrer from public GitLab pages 2014-07-28 16:41:37 +02:00
Jacob Vosmaer 914275ac0a Add omnibus-gitlab to the monthly release process 2014-07-28 15:11:27 +02:00
Robert Schilling ceabda743a Improve markup gems 2014-07-28 11:47:27 +02:00
Robert Schilling 2e55eac215 7.2 started 2014-07-28 10:24:49 +02:00
Robert Schilling 062ff17b1c Do not execute hooks on empty projects, fixes #6108 2014-07-27 23:48:53 +02:00
Dmitriy Zaporozhets 00c6723883 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-27 21:38:19 +03:00
Dmitriy Zaporozhets c77315dc50 Merge branch 'fix_typo_application_scss' into 'master' 
Add missing semicolon in application.scss

Was toying to import some custom css and found out about this :)

See merge request !157
 2014-07-27 18:36:37 +00:00
Sytse Sijbrandij 3c420ae17b Merge branch 'test_regex_with_rubular' into 'master' 
Add a tip on how to test regular expressions

See merge request !994
 2014-07-27 16:06:42 +00:00
Sytse Sijbrandij 7da74468b3 Merge branch 'add-merge-moments-to-process' into 'master' 
Add merge moments to process

Fixes #1450

See merge request !986
 2014-07-27 15:32:26 +00:00
Achilleas Pipinellis 2f78d75c4a Add missing semicolon in application.scss 2014-07-27 09:31:31 +03:00
Matthew McMillion afc5b7110f Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests 2014-07-26 12:43:04 -05:00
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
Jacob Vosmaer e03ab14f78 Add a tip on how to test regular expressions 2014-07-25 18:26:04 +02: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
Pierre de La Morinerie 32a6f41f1c Include "Merge-request reopened" emails in the proper email thread 2014-07-25 10:50:58 +02:00
Christian TaedckeandChristian Taedcke e59674f954 Add full commit message to commit api as field message. 2014-07-25 08:25:16 +02: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