Commit Graph
8955 Commits
Author SHA1 Message Date
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 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 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
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -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 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
Sheigutn 63924efeaf Add support for colored header on Android Lollipop with Chrome 2015-01-13 21:04:04 +01:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -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
Dmitriy Zaporozhets 9ce7492e58 Merge pull request #8540 from yglukhov/wiki-history
First entry in wiki history leads to newest revision.
2015-01-13 10:02:25 -08:00
phortx e64e0104fa Reorders label colors for better "rainbow" 2015-01-13 15:47:23 +01:00
phortx 5b32fda4b8 Add more label color suggestions 2015-01-13 15:38:38 +01:00
Marin Jankovski 5140bd8824 When anchor is clicked set the correct condition. 2015-01-13 13:14:32 +01:00
Marin Jankovski b1792d9e4c Scroll the readme anchors below the navbar. 2015-01-13 13:01:50 +01:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Dmitriy Zaporozhets 3103e567bc Merge branch 'fix_constant' into 'master'
ForbiddenAction constant name fix

See merge request !1387
2015-01-12 21:19:04 +00:00
Dmitriy Zaporozhets 6774a701a6 Merge branch 'refactor_push_data_builder' into 'master'
Refactor push data builder

See merge request !1384
2015-01-12 21:06:35 +00:00
Valery Sizov 058f223b01 ForbiddenAction constant fix 2015-01-12 09:30:52 -08:00
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -08:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01:00
Dmitriy Zaporozhets 4e7df0037a Fix ci data in hook when create git tag via UI 2015-01-12 00:05:04 -08:00
Dmitriy Zaporozhets 3197044512 Refactor push data builder. Moved it to separate class
Also execute GitLab CI on creating tag via UI
2015-01-11 23:51:31 -08:00
Dmitriy Zaporozhets 2543af84f0 Execute GitLab CI on tag push 2015-01-10 22:18:14 -08:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
Flatten the directory hierarchy while there is only one directory descendant

In some languages, especially java, the directory structure reflects the package structure.This means that using the file tree browser to reach the directories that matter you have to click a lot of directories containing only another subdirectory.

This merge request tries to enhance this by showing and providing the link to the first directory that doesn't contain only one directory.

See also [this feature request](http://feedback.gitlab.com/forums/176466-general/suggestions/6236769-jump-forward-to-the-first-folder-that-has-more-tha)

This is very similar to what [GitHub does](https://github.com/blog/1877-folder-jumping), but I don't think graying out the empty directories is really necessary.

Screenshots: [Before](https://gitlab.com/uploads/marmis85/gitlab-ce/b683a0000f/before.png) - [After](https://gitlab.com/uploads/marmis85/gitlab-ce/a23725a1c1/after.png)

I'm actually very new at ruby, rails, haml, and almost everything involved in Gitlab's development...
From what I could understand, when we render each directory item in the list we only have the data structure representing the item but not his descendants.
To iterate through the hierarchy I call Gitlab::Git:Tree.where() but I'm not sure if this is the most efficient way.

I also considered making every directory a clickable link, but I tried that and in the end it wasn't very useful and reduced the click target for the most useful directory.

See merge request !275
2015-01-11 04:42:28 +00:00
Dmitriy Zaporozhets b758b4c80b If noteable is nil - make discussion outdated 2015-01-10 19:26:00 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets 08c9cb4cab Finally fix stuff related to dynamic config 2015-01-08 14:26:43 -08:00
Dmitriy Zaporozhets 939c046a98 Fix feature and tests 2015-01-08 13:21:00 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Dmitriy Zaporozhets de6256ee67 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 21:50:00 -08:00
Dmitriy Zaporozhets 7eeec5e45a Ooops! Removing debug line :) 2015-01-06 17:00:27 -08:00
Dmitriy Zaporozhets 1269faa6ad Merge pull request #8503 from cirosantilli/unused-ex-var
Remove unused ex local variable from event.rb
2015-01-06 16:54:27 -08:00
Dmitriy Zaporozhets ccdf08d80a Refactor merge request merge service
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
2015-01-06 16:24:47 -08:00
Dmitriy Zaporozhets b55a0519ac Pass source project variable to commits list on MR page 2015-01-06 15:39:33 -08:00
Dmitriy Zaporozhets b8f48bf414 Restyle and refactor dashboard projects page filtering 2015-01-06 13:09:56 -08:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
Dmitriy Zaporozhets 560e717fd6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-06 10:35:54 -08:00