home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,377 Commits 48 Branches 340 Tags
5cd304dd5e6df7cf8d587d8cf59fa8b49aee276a
Commit Graph
14377 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 5cd304dd5e Merge branch 'fix-invalid-syntax' into 'master' 
Fix git syntax issue for git version older then 1.7.10

For #2067

See merge request !1599
 2015-02-26 02:49:12 +00:00
Dmitriy Zaporozhets 6cee8d776b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-25 15:36:28 -08:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets 1511506f72 Fix git syntax issue 2015-02-25 15:17:20 -08:00
Douwe Maan 43f1ab9c12 Move CHANGELOG entry to 7.9. 2015-02-25 23:25:08 +01:00
Sytse Sijbrandij 4ac5281f59 Merge pull request #8486 from kfei/docker/graceful-shutdown 
Gracefully shutdown services in Docker container
 2015-02-25 14:04:32 -08:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Dmitriy Zaporozhets 7475f4f00d Merge pull request #8865 from gemnasium/update-gemnasium-to-0-2-4 
Bump gemnasium service gem
 2015-02-25 09:11:02 -08:00
Philippe Lafoucrière 183f521079 Bump gemnasium service gem 2015-02-25 10:14:10 -05:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Dmitriy Zaporozhets a30a56634d Merge branch 'refactor-header' into 'master' 
UI: refactor header css

See merge request !1591
 2015-02-25 07:56:28 +00:00
Dmitriy Zaporozhets 878e86bf64 Remove unnecessary theme_type from body class 2015-02-24 23:26:32 -08:00
Dmitriy Zaporozhets ee343661e1 Get rid of black logo 2015-02-24 23:17:11 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Dmitriy Zaporozhets 5b7747bd9d Merge branch 'affix-sidebar' into 'master' 
Improve admin projects and users pages for mobile devices

See merge request !1590
 2015-02-25 06:20:26 +00:00
Dmitriy Zaporozhets 1faf3676aa Refactor gitlab themes css 2015-02-24 22:19:14 -08:00
Dmitriy Zaporozhets 6fe057cc7b Fix header avatar size 2015-02-24 21:40:47 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00
Marin Jankovski 82483f9536 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-24 16:54:26 -08:00
Marin Jankovski 4aeb916566 Update changelog for 7.8.1 2015-02-24 16:53:59 -08:00
Dmitriy Zaporozhets 2cd2543c44 Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' 
Give last_activity_at a default value so it will always be set

For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345

See merge request !1589
 2015-02-24 23:15:04 +00:00
Douwe Maan 56f51bed6b Expand Bitbucket integration docs. 2015-02-25 00:06:55 +01:00
Dmitriy Zaporozhets b7dd0decf8 Merge branch 'fix-404-admin-delete' into 'master' 
Fix 404 when deleting a project from the admin section

This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing.

See merge request !351
 2015-02-24 21:18:20 +00:00
Dmitriy Zaporozhets 53784fb637 Merge branch 'master' into 'master' 
Updated Gitorious import icons

See merge request !353
 2015-02-24 21:17:11 +00:00
Dmitriy Zaporozhets 2cedeb4856 Merge branch 'contributed-projects' into 'master' 
Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554
 2015-02-24 21:07:05 +00:00
Dmitriy Zaporozhets d73a058941 Merge branch 'update_grack' into 'master' 
Update gitlab-grack to 2.0.0.rc2

See merge request !1585
 2015-02-24 20:58:19 +00:00
Dmitriy Zaporozhets 037a981017 Merge branch 'sidebar_state_toggle' into 'master' 
Toggle sidebar button more obvious

The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044

See merge request !1579
 2015-02-24 20:49:31 +00:00
Dmitriy Zaporozhets ecb12f2111 Merge branch 'master' into update_grack 
Conflicts:
	Gemfile.lock
 2015-02-24 11:51:08 -08:00
Dmitriy Zaporozhets 75048fcd69 Revert "Update charlock_holmes to 0.7.3" 
This reverts commit c217860ae7.
 2015-02-24 11:46:42 -08:00
Dmitriy Zaporozhets 7bcf1c0044 Merge branch 'gitlab_linguist_update' into 'master' 
Update gitlab-linguist

Closes #1859

See merge request !1588
 2015-02-24 19:39:51 +00:00
Dmitriy Zaporozhets 46516411ef Merge branch 'web_editor_branch' into 'master' 
Web Editor: save to new branch

Implements #1931

See merge request !1523
 2015-02-24 19:38:45 +00:00
Valery Sizov 545f12d548 update gitlab-linguist 2015-02-24 20:46:52 +02:00
Valery Sizov 53e404144c changelog && documentation 2015-02-24 20:36:11 +02:00
Sabba Petri 5b6d6bbc19 Added square caret to Back to Settings button 
This was done to show difference between Open/Close toggle, which
was using the same arrow as Back to Settings button previously.
 2015-02-24 09:42:35 -08:00
Sabba Petri 7f200b7d18 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle 2015-02-24 09:41:10 -08:00
Dmitriy Zaporozhets 428df28cda Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-24 09:13:29 -08:00
Douwe Maan 5179c5830b Contributed projects either have user pushes or created MRs. 2015-02-24 18:13:11 +01:00
Dmitriy Zaporozhets 59877d313e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-24 09:09:31 -08:00
Dmitriy Zaporozhets f7c948223d Fix access to attachments uploaded with 'Choose file' button for public 
access
 2015-02-24 09:08:34 -08:00
Douwe Maan 1bf9fa8c7f Exclude forks from profile contributions list. 2015-02-24 16:28:23 +01:00
Douwe Maan 769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan 46bcf40b2c Add ".org" back to Gitorious mentions. 2015-02-24 15:08:42 +01:00
Douwe Maan fcd3e626b0 Move CHANGELOG entry. 2015-02-24 15:07:25 +01:00
Douwe Maan 16c767814a Re-enable rescuing from Bitbucket OAuth errors. 2015-02-24 15:07:25 +01:00
Douwe Maan bc80efb1fd Bring Gitorious import page in line with others. 2015-02-24 15:07:25 +01:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan 3fde1dce1f Satisfy Rubocop. 2015-02-24 15:07:25 +01:00
Douwe Maan a938b3eeb4 Link to original repo on import status pages. 2015-02-24 15:07:24 +01:00
Douwe Maan 6979b3afd5 Delete deploy key from Bitbucket after importing. 2015-02-24 15:07:24 +01:00
Douwe Maan f2b37de54b Fix specs. 2015-02-24 15:07:24 +01:00