home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,812 Commits 48 Branches 340 Tags
dffa2fa9e92e37a664afa2807fd5b01fbbd87ef2
Commit Graph
390 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search 
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
 2015-03-12 16:20:58 -07:00
Sabba PetriandMarin Jankovski b5ec0d6d45 Spelling change Commit Statistics 2015-03-03 20:38:42 -08:00
Aorimn f84b7eef3f Add Irker service 
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/
 2015-03-01 20:51:03 +01:00
Dmitriy Zaporozhets cd6baa1415 Merge branch 'line-is-wrong-test' into 'master' 
Make test element selection more specific to fix constantly failing test.

Fixes #2051.

The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist:

> The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element.

This caused the test to fail.

See merge request !1592
 2015-02-26 02:57:22 +00: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
Douwe Maan 9b8d5c4ab4 Make test element selection more specific. 2015-02-25 11:01:50 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Valery Sizov 3177693c6f WebEditor: save to new branch: spinach 2015-02-24 11:43:20 +02:00
Douwe Maan 4ef6ffaad3 Split up AttachmentUploader. 2015-02-20 15:19:50 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 6a6a334522 Fix active tab tests 2015-02-19 17:24:34 -08:00
Dmitriy Zaporozhets 8184a65644 Revert "Fix broken access control and refactor avatar upload" 
This reverts commit 7d5f86f6cb.
 2015-02-19 08:57:35 -08:00
Dmitriy Zaporozhets 0da0d800f2 Merge branch 'md-preview-class' into 'master' 
Make sure Markdown previews always use the same styling as the eventual destination.

Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.

See merge request !1514
 2015-02-17 20:38:53 +00:00
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Hannes RosenöggerandDouwe Maan 7d5f86f6cb Fix broken access control and refactor avatar upload 
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
 2015-02-16 20:10:15 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Jeroen van Baarsen 6860004466 Fixed deprecation in spinach stubs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:22:23 +01:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets ce0811ae5c Improve tests 2015-02-06 09:19:51 -08:00
Jeremy 3cd1eda5a4 Add restrict_to_branch to service controller 
And add restrict_to_branch to spec
 2015-02-02 09:59:42 +01:00
Jeremy b4d9ceb26f Add Asana service 
Also add ability to render "service.help" in markdown
 2015-02-02 09:59:42 +01:00
Dmitriy Zaporozhets b076d8cddb Fix test for merge request 2015-01-28 15:36:12 -08:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master' 
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
 2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets e956066d4a Add tests for initializing bare repo and creating new file in it 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets 90ba3a385c Fix tests for blobs refactoring 2015-01-26 16:08:59 -08:00
Marin Jankovski 9b5b334a79 Remove unused feature steps. 2015-01-26 16:04:08 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets 9c0d241e27 Fix tests 2015-01-16 08:47:58 -08:00
Dmitriy Zaporozhets f891ababeb Fix randomly failing test 2015-01-10 21:42:16 -08:00
Dmitriy Zaporozhets 5dbbec4612 Merge pull request #8520 from cirosantilli/edit-blob-link-tests 
Add tests for disabled blob edit button cases v2
 2015-01-03 14:07:43 +02:00
Dmitriy Zaporozhets 884352294d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 20:10:46 +02:00
Ciro Santilli 18fa155025 Add tests for disabled blob edit button cases. 2014-12-30 18:19:48 +01:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02:00
Dmitriy Zaporozhets 3d2f123081 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:31:30 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Dmitriy Zaporozhets fca161f5c5 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:12 +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
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets 5b49bb208a Fix issueable context update and fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:42:26 +02:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 15:02:47 +02: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 4cbe72d767 UI improvements mostly for mobile screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 11:31:57 +02:00
Daniel AquinoandDoug Goldstein 1353f9aa64 HipChat service: support custom servers 
HipChat allows users to run their own private servers and to be able to
support those we must connect to the correct URL when using one of these
custom servers.
 2014-11-19 21:27:24 -06:00
Doug Goldstein 2f3df4cb56 HipChat service: correct service name & use v2 API 
HipChat refers to their own product camel cased so we should do the
same. HipChat no longer recommends people use the deprecated v1 API so
switch to using the v2 API by default. hipchat-rb does not yet default
to v2 in any version so it must be specified.
 2014-11-19 21:26:58 -06: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
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button 
Transform remove blob link into button.
 2014-11-05 14:09:32 +02:00