home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1798 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 23255bff99 Merge branch 'send_checkout_sha_to_services' into 'master' 
Send checkout sha to services

In case of tags it may be useful to have sha of commit this tag points to.
So now web hooks and services get additional parameter `checkout_sha`

See merge request !1400
 2015-01-15 20:01:31 +00:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01: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 bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08: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
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -08:00
Marin Jankovski ef0cf7b42d Fix the api project ordering spec. 2015-01-12 11:49:07 +01:00
Marin Jankovski 8689ce1efe Add search filter option on project api for authorized projects. 2015-01-12 11:08:53 +01: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 f31a96104f Add flatten-dir branch to seed repo 2015-01-10 22:48:16 -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
marmis85 02adb9ccd6 point to a specific branch in the test repo to avoid conflicts 2015-01-11 05:07:34 +01:00
Valery Sizov ee28ee5f13 rspec fix 2015-01-10 20:04:06 -08:00
marmis85 32233d522f updated master to latests sha 2015-01-11 00:15:56 +01:00
marmis85 3efb06a22b Add test spec for TreeHelper module 2015-01-10 21:37:48 +01:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -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 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Marin Jankovski 1fbeaa0684 Merge branch 'master' into update_api_messages 
Conflicts:
	CHANGELOG
 2015-01-07 12:30:08 +01:00
Marin Jankovski 8dd672776e Fix failing tests due to updates on the return messages. 2015-01-07 11:39:20 +01:00
Dmitriy Zaporozhets ee9849b736 Improve mr refresh service tests 2015-01-06 18:05:10 -08:00
Jeroen van Baarsen 2a4ee2fd7f make sure the user.name is escaped 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-01-04 14:09:35 +01:00
Marin Jankovski 0da5154b5a Fix api tests. 2014-12-30 15:40:11 +01:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Dmitriy Zaporozhets cf95736865 New feature: add 'Mention' notification level 
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:55:21 +02:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Marin Jankovski 84af3ceb9b Add spec for developers can push to protected branches. 2014-12-26 11:41:04 +01:00
uranandyglukhov 1fbc010241 Implemented notes (body) patching in API. 2014-12-25 14:28:40 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master' 
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
 2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets f775809910 Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 19:11:15 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
 2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Dmitriy Zaporozhets 6a5766e370 Merge pull request #7978 from cirosantilli/edit-preview-route-test 
Add tests for tree edit routes
 2014-12-20 20:17:25 +02:00
Dmitriy Zaporozhets bfebab1c10 Fix snippet factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 15:55:06 +02:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Marin Jankovski 22368fb8e8 Add a failing route spec for file named diff. 2014-12-10 15:52:56 +01:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets bbf9953b99 Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master' 
Attachment url should not be overwritten

Fixes #1786

See merge request !1308
 2014-12-07 20:51:54 +00:00
Dmitriy Zaporozhets c8a96d8ab0 More tests for issues finder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:25:22 +02:00
Marin Jankovski 3f1fad5f09 Add an avatar_url spec when relative url is set. 2014-12-05 15:59:55 +01:00
Dmitriy Zaporozhets e6c5a8b161 Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' 
Rake task for google email schema verfication

#1607

See merge request !1300
 2014-12-05 10:19:10 +00:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Valery Sizov f9a730ebb4 fix specs 2014-12-04 15:53:26 +02:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00