home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
293 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -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 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08: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
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
Marin Jankovski 16ebeedef2 Update branch status with ajax call. 2014-12-26 15:37:04 +01:00
Marin Jankovski 92eb3974ac Add option to disable/enable developers push to already protected branches. 2014-12-26 11:39:12 +01:00
Marin Jankovski b7eb0d178e Add checkbox for protected branch developer can push to. 2014-12-26 09:14:53 +01:00
Dmitriy Zaporozhets 016981c009 Refactor issuable list pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:04:33 +02:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +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 e0f30c605b Add author filter for issues & merge requests pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:13:07 +02:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets db2edff937 Handle web hook exception 
Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 15:07:01 +02:00
Dmitriy Zaporozhets d7568727b9 Merge pull request #8283 from cardoe/hipchat-private-server 
HipChat custom server support
 2014-12-01 18:25:28 +02:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:50:25 +02:00
Valery Sizov e683d9c087 Possibility to create Milestones or Labels when Issues are disabled 2014-11-20 18:18:16 +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
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master' 
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
 2014-11-18 10:44:15 +00:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project 
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 22:06:19 +02:00
Marin Jankovski 334fe86574 Sanitize branch name and ref name 2014-11-13 16:20:43 +01:00
Valery Sizov 6f34d40436 remove auth duplication 2014-11-05 11:04:08 +02:00
Dmitriy Zaporozhets 961a6bfcc2 API delete branch: render branch name json instead of true 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 17:28:59 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets 8ad9a75f88 Merge pull request #8030 from cirosantilli/factor-authorize 
Factor authorize_push! and authorize_code_access!
 2014-10-21 11:43:12 +03:00
Dmitriy Zaporozhets 5ce9f89c7b Merge pull request #8102 from cirosantilli/use-memoized-project 
Use @project on controllers, don't call method
 2014-10-21 11:41:03 +03:00
Ciro Santilli 9e1b97ad99 Use @project on controllers, don't call method 
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
 2014-10-19 23:36:23 +02:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms 
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
 2014-10-15 23:52:33 -05:00
Ciro Santilli 4d0d5e79ba Factor authorize_push! and authorize_code_access! 
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
 2014-10-13 21:31:49 +02:00
Ciro Santilli 2d23522107 Use :message key, not :error for File::Service. 2014-10-13 20:55:09 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Ciro Santilli ceaebe233c Remove outdated comment from commits_controller 2014-10-07 18:52:16 +02:00
Dmitriy Zaporozhets 70004f4ef6 Merge branch 'slack_integration' into 'master' 
Slack integration

See merge request !1151
 2014-10-06 16:14:48 +00:00
Marin Jankovski 1db8d3104c Add missing comma. 2014-10-06 11:51:15 +02:00
Marin Jankovski 2017977214 Use only webhook for slack service integration. 2014-10-06 10:44:01 +02:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets 4ebe718d69 Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
 2014-10-03 13:34:25 +03:00
Dmitriy Zaporozhets 8e33f9460c Show test coverage results in MR if available 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 18:17:47 +03:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Ciro Santilli 0f12e051c0 Remove statement without effect. 2014-09-30 17:53:54 +02:00
Dmitriy Zaporozhets 88b1e0ffcd Faster branch contains detection for commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:40:13 +03:00
Dmitriy Zaporozhets 3a8cd1fa59 Refactor commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:05:17 +03:00
Dmitriy Zaporozhets 6d0ddf45ba Raw implementation of commits stats page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 20:32:44 +03:00
Dmitriy Zaporozhets 20e0c9b132 Rewrite graphs feature 
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:41 +03:00
Dmitriy Zaporozhets 810028f3f3 Dont show blocked users in assignee filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:05:27 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master' 
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
 2014-09-25 13:58:20 +00:00