home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,424 Commits 48 Branches 340 Tags
5254de907da2c8cd5ff09ccc3ddeba7c2f55db4b
Commit Graph
13424 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 5254de907d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 11:18:26 -08:00
Dmitriy Zaporozhets 4cd1b6d98e Merge branch 'fix-tab-index' into 'master' 
Fix tab index

Fixes #1892

See merge request !1401
 2015-01-15 19:18:04 +00:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Sytse Sijbrandij e310199a53 Merge pull request #8576 from kfei/docker/update-omnibus-package 
Update the Omnibus package in Dockerfile
 2015-01-15 10:26:41 -08:00
Dmitriy Zaporozhets 1e0f36b42a Merge branch 'fix-comments' into 'master' 
Fix comments

Fixes:

* drag-n-drop works for diff comments
* selecting images works for diff comments
* preview works for edit comments
* drag-n-drop works for edit comments
* selecting images works for edit comments
* if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs.
* Correctly hide form when edit comment on diff
* fix full-screen for diff comments

See merge request !1398
 2015-01-15 09:18:10 +00:00
Dmitriy Zaporozhets b124d9e0bb Comment broken test because I dont have time to improve it 2015-01-15 01:17:07 -08:00
Dmitriy Zaporozhets 10f45cf33a Fix specs 2015-01-15 00:37:33 -08:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 3333bd4608 Explicitly enable drag-n-drop for issue/mr/wiki markdown forms 2015-01-14 23:18:21 -08:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 28dc04aac2 Merge branch 'view-link-first' into 'master' 
View link first

See merge request !1397
 2015-01-15 06:43:51 +00:00
Dmitriy Zaporozhets 47f0a8dbdd Merge branch 'fix-scroll-issue' into 'master' 
Fix scroll issue

Fixes #1886

See merge request !1396
 2015-01-15 06:43:25 +00:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -08:00
Sytse Sijbrandij f8b97b454b Make view link come first so I don't have to mouse to the end of the email line. 2015-01-14 21:12:16 -08:00
Dmitriy Zaporozhets 8bc65f6d4b Fix anchors being hidden under fixed navbar issue 2015-01-14 19:39:10 -08:00
kfei 210a13ad42 Update the Omnibus package in Dockerfile 
From 7.5.3 to 7.6.2.

Signed-off-by: kfei <kfei@kfei.net>
 2015-01-15 11:34:49 +08:00
Dmitriy Zaporozhets 2c053c93b2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-14 18:42:52 -08:00
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -08:00
Dmitriy Zaporozhets 41353b6362 Fix code block in rc1 doc 2015-01-15 02:07:42 +00:00
Dmitriy Zaporozhets 8e36070cce Remove bold text 2015-01-14 17:44:59 -08:00
Dmitriy Zaporozhets 973449b567 Update guides for CE 2015-01-14 17:40:35 -08:00
Dmitriy Zaporozhets a7dddd1bca Create update doc for 7.7 2015-01-14 17:34:39 -08:00
Dmitriy Zaporozhets 36acf5b293 Revert "Fix tests" 
This reverts commit 1e45ba7f16.
 2015-01-14 17:22:48 -08:00
Dmitriy Zaporozhets 46ed6fb58f Revert "Fix anchor issue with fixed navbar" 
This reverts commit 204b3c121c.
 2015-01-14 17:22:36 -08:00
Dmitriy Zaporozhets 18b7acc399 Merge branch 'fix-anchor-bug' into 'master' 
Fix anchor bug

Fixes #1886

See merge request !1395
 2015-01-15 00:42:55 +00:00
Dmitriy Zaporozhets 1e45ba7f16 Fix tests 2015-01-14 16:23:20 -08:00
Dmitriy Zaporozhets 204b3c121c Fix anchor issue with fixed navbar 
When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination
 2015-01-14 15:22:31 -08:00
Dmitriy Zaporozhets ff7f4a134e Revert "Scroll the readme anchors below the navbar." 
This reverts commit b1792d9e4c.
 2015-01-14 09:57:38 -08:00
Dmitriy Zaporozhets 55947addc3 Revert "When anchor is clicked set the correct condition." 
This reverts commit 5140bd8824.
 2015-01-14 09:56:33 -08:00
Dmitriy Zaporozhets 3bf9b6604b Merge branch 'rescue_database_error' into 'master' 
Rescue database error

We need to check which database is setup but we cannot assume that the database exists already. Not checking this will break rake gitlab:setup for packaging as we need to do asset precompile before the database exists.

See merge request !1393
 2015-01-14 17:34:05 +00:00
Dmitriy Zaporozhets 9920ede257 Merge branch 'enable-signup' into 'master' 
Enable signup by default

See merge request !1394
 2015-01-14 17:32:33 +00:00
Jacob Vosmaer 3c5c1a7802 Enable signup by default 2015-01-14 17:42:44 +01:00
Marin Jankovski e348af1d4c Rescue database error in application settings if the database still doesn't exist. 2015-01-14 09:03:25 +01:00
Dmitriy Zaporozhets 01ab081259 Merge branch 'doorkeeper_update' into 'master' 
Doorkeeper update

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398

See merge request !1392
 2015-01-14 01:23:53 +00:00
Valery Sizov 1c49c30119 doorkeeper update 2015-01-13 15:46:00 -08:00
Dmitriy Zaporozhets 8ac16a6b32 Cleanup CHANGELOG 2015-01-13 14:47:27 -08:00
Dmitriy Zaporozhets c7e0e4e8a4 Merge branch 'gitlab_shell_bump' into 'master' 
Gitlab shell bump

See merge request !1391
 2015-01-13 20:54:40 +00:00
Valery Sizov 48f81ca7a7 gitlab-shell bump 2015-01-13 12:16:40 -08:00
Dmitriy Zaporozhets be9f5589ed Merge branch 'oauth_api_doc' into 'master' 
OAuth2 API documentation

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

See merge request !1388
 2015-01-13 19:56:43 +00:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets 4d03a2803e Update changelog 2015-01-13 10:47:20 -08:00
Dmitriy Zaporozhets 1358152848 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-13 10:45:49 -08:00
Dmitriy Zaporozhets a16d894b21 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-13 10:45:33 -08:00
Dmitriy Zaporozhets 72c3d728c4 Update db schema 2015-01-13 10:45:14 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets ef933a4a96 Improve import page 2015-01-13 10:34:01 -08:00
Sytse Sijbrandij e351b26f84 Merge branch 'prose-requirement' into 'master' 
Prose requirement

Feel free to improve or link to authoritative source.

See merge request !285
 2015-01-13 18:27:35 +00:00
Sytse Sijbrandij f26c0fa556 Link to guidelines for interface text. 2015-01-13 10:26:55 -08:00
Sytse Sijbrandij 6cce2be7eb Get rid of here links and simplify text. 2015-01-13 10:20:04 -08:00