home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,746 Commits 48 Branches 340 Tags
5f65310fcd8a07d5ceafb1c71edf33fd8ee4dafe
Commit Graph
12746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 5f65310fcd Merge pull request #8319 from bbodenmiller/patch-12 
start gitlab after mysql tweaks
 2014-11-23 18:37:09 +01:00
Ben Bodenmiller 44e53aefd4 start gitlab after mysql tweaks 2014-11-23 02:28:34 -08:00
Valery Sizov a7ddcab7aa Merge branch 'members_table_timestamps' into 'master' 
Add missing timestamps to the 'members' table

In 20140914145549_migrate_to_new_members_model.rb we forgot to set the
created_at and updated_at times for new records in the 'members' table. This
became a problem after commit c8e78d972a which
was added in GitLab 7.5. With this migration we ensure that all rows in
'members' have at least some created_at and updated_at timestamp.

See merge request !1272
 2014-11-21 15:15:21 +00:00
Jacob Vosmaer 4053c055be Add missing timestamps to the 'members' table 2014-11-21 15:02:23 +01:00
Marin Jankovski e4af2b3db5 Merge branch 'milestones_labels' into 'master' 
Possibility to create Milestones or Labels when Issues are disabled

https://dev.gitlab.org/gitlab/gitlabhq/issues/1682

See merge request !1270
 2014-11-21 11:11:52 +00:00
Valery Sizov e683d9c087 Possibility to create Milestones or Labels when Issues are disabled 2014-11-20 18:18:16 +02:00
Jacob Vosmaer 1b34a24ffd Merge branch 'shell220' into 'master' 
Add GitLab shell update to update guide

See merge request !1269
 2014-11-20 15:31:10 +00:00
Job van der Voort 2e0bbe68cb you have to update gitlab shell for gitlab 7.5 2014-11-20 15:58:03 +01:00
Jacob Vosmaer b036300f0a Merge branch 'rebuild-keys' into 'master' 
Rebuild keys

This was clearly lacking for the documenation.

See merge request !1267
 2014-11-20 12:23:25 +00:00
Job van der Voort a72a919ae5 add correct path to rebuild-keys doc 2014-11-20 12:22:46 +01:00
Job van der Voort c4fc734e78 add rebuilding of authorized_keys to docs 2014-11-20 12:18:28 +01:00
Dmitriy Zaporozhets 20cd7a50be Merge branch 'improve-mobile-ui' into 'master' 
Improve mobile UI. pt1

Related to #1493

* [x] App Header
* [x] Dashboard
* [x] Project home page

See merge request !1266
 2014-11-19 17:11:06 +00:00
Dmitriy Zaporozhets 580cedd76c Fix header and project home ui for mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-19 18:11:16 +02:00
Dmitriy Zaporozhets e65866d4ff Improve dashboard page for mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-19 17:45:41 +02:00
Dmitriy Zaporozhets a726042773 Merge branch 'increase-font-size' into 'master' 
Increase font size

Increase markdown typography font size to 15px.

Affected:

* wiki
* issue/mr description
* md files
* comments

Fixes #1662

See merge request !1265
 2014-11-19 14:40:13 +00:00
Dmitriy Zaporozhets b34f1be47f Increase md typography font size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-19 15:48:28 +02:00
Valery Sizov 291571ec29 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-19 11:18:53 +02:00
Valery Sizov 23ef178357 bump gitlab_shell 2014-11-19 11:11:27 +02:00
Robert Schilling fb3009de63 Merge pull request #8345 from dserodio/doc-improvement 
Small improvement to /api/user/keys docs
 2014-11-18 19:30:33 +01:00
Dmitriy Zaporozhets 0dcc9f39be Merge branch 'hide-gpg-signature' into 'master' 
Hide gpg signature

Fixes #1743

See merge request !1263
 2014-11-18 17:24:23 +00:00
Dmitriy Zaporozhets fe46a5c084 Start 7.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 18:44:12 +02:00
Dmitriy Zaporozhets 4c5cc19844 Merge branch 'bump-gitlab_git' into 'master' 
Bump gitlab git

See merge request !1261
 2014-11-18 16:35:32 +00:00
Dmitriy Zaporozhets f9aead9f6e Hide gpg signature on tags page from tag message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 18:00:38 +02:00
Dmitriy Zaporozhets 7fb3b908ed Bump gitlab_git with new rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 17:51:39 +02:00
Dmitriy Zaporozhets 435128171d Merge branch 'fix_tests' into 'master' 
Fix tests

See merge request !1262
 2014-11-18 15:50:41 +00:00
Dmitriy Zaporozhets 8e7fa0c2a1 Use new gitlab-shell v2.3.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 17:15:51 +02:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Dmitriy Zaporozhets cfee95d032 Merge pull request #8340 from cirosantilli/multi-ruby-install-v2 
Web edit and HTTPS push work if multiple Rubies installed v2
 2014-11-18 15:00:56 +02:00
Daniel Serodio 1016acc609 Small improvement to /api/user/keys doc 
The keys resource includes a create_at attribute
 2014-11-18 10:59:04 -02:00
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master' 
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
 2014-11-18 10:44:15 +00:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Jacob Vosmaer d803f210aa Merge branch '7-5-update-doc' into 'master' 
Updated documentation for 7.5 release

Documentation for 7.5 release has been updated. Changes include:

- Pointed Ruby version in guides to 2.1.5
- Pointed gitlab-shell version in guides to 2.2.0

See merge request !1259
 2014-11-18 09:49:00 +00:00
Patricio Cano da35baed65 Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-17 16:56:51 -05:00
Dmitriy Zaporozhets e37461979a Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-17 17:56:07 +02:00
Valery Sizov 30ac909f30 Merge branch 'update_changelog_' into 'master' 
Update changelog

See merge request !1258
 2014-11-17 11:04:15 +00:00
Valery Sizov 214f6985a8 Update changelog 2014-11-17 11:03:03 +00:00
Robert Schilling 944e2445c4 Merge pull request #8312 from bbodenmiller/patch-4 
remove duplicate time zone entry in CHANGELOG
 2014-11-17 01:10:28 +01:00
Robert Schilling ee6da7eacd Merge pull request #8310 from bbodenmiller/patch-3 
fix backup rake task
 2014-11-17 01:05:48 +01:00
Robert Schilling d9cb3ffaf0 Merge pull request #8316 from bbodenmiller/patch-1 
remove extra cd command
 2014-11-17 00:59:55 +01:00
Ben Bodenmiller 5b5446bd76 remove extra cd command 2014-11-15 06:25:08 -08:00
Ben Bodenmiller 987007b8db remove duplicate time zone entry in CHANGELOG 2014-11-15 02:17:01 -08:00
Dmitriy Zaporozhets 75c3dc9efc Merge branch 'sidekiq_gc_start' into 'master' 
Run 'GC.start' after every EmailsOnPushWorker job

This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com.

See merge request !1257
 2014-11-14 14:48:30 +00:00
Dmitriy Zaporozhets 66f0c27971 Merge branch 'update-gitlab-git' into 'master' 
Update gitlab_git to 7.0.0.rc11

See merge request !1256
 2014-11-14 14:47:08 +00:00
Dmitriy Zaporozhets e53f9b4d69 Merge branch 'gitlab.com-packages' into 'master' 
Gitlab.com uses special packages, build them first

See merge request !1255
 2014-11-14 14:25:41 +00:00
Dmitriy Zaporozhets a69249d9de Merge branch 'author_attributes_clean' into 'master' 
Author attributes clean

See merge request !1254
 2014-11-14 14:10:03 +00:00
Dmitriy Zaporozhets 7e3f49bab0 Merge branch 'branch_name' into 'master' 
Strip tags from branch name

See merge request !1251
 2014-11-14 14:09:29 +00:00
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature 
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 16:06:39 +02:00
Jacob Vosmaer c10f61802b Run 'GC.start' after every EmailsOnPushWorker job 2014-11-14 12:22:22 +01:00
Jacob Vosmaer a9dc2c2029 Update gitlab_git to 7.0.0.rc11 2014-11-14 12:14:17 +01:00
Dmitriy Zaporozhets d2c3c98e3c Routing specs for fork projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 12:55:13 +02:00