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
31,799 Commits 48 Branches 340 Tags
4c388fb86500a2691c7b584ffafcbac18d643cab
Commit Graph
300 Commits
Author SHA1 Message Date
Grzegorz Bizon c6f9a1c273 Enable Style/IdenticalConditionalBranches Rubocop cop 2016-07-08 11:04:04 +02:00
Paco Guzman 0601ce1871 Avoid instantiation of a Git::Tree 
Only needed when the project view is ‘Files view’
 2016-06-29 17:56:15 +02:00
Paco Guzman 79c521f5df Provide default branch/file path for ProjectsController#show 2016-06-20 21:44:22 +02:00
Phil Hughes f112e2a1da Fixed issue with returning ref in commits JSON 
Added tests to project controller
 2016-06-20 11:37:27 +01:00
Phil Hughes c240cad59a Fixed Ruby to use exclude 2016-06-18 21:49:20 +01:00
Phil Hughes 68c9981013 Correctly adds commit ID into dropdown 
Removes un-used method
Fixes other Ruby issues
 2016-06-18 21:49:20 +01:00
Phil Hughes 3c8c912965 Pulls back tags if any exist 2016-06-18 21:49:20 +01:00
Phil Hughes d2362e2edf Tests fix for ref switcher 2016-06-18 21:49:20 +01:00
Phil Hughes deca5ef200 Refs dropdown is now loaded async 2016-06-18 21:49:20 +01:00
Douwe Maan 9b7fd74805 Merge branch 'feature/project-export' into 'master' 
Export project functionality

This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.

- [x] members
- DB data
  - [x] issues
  - [x] issue comments
  - [x] merge requests
  - [x] merge request diff
  - [x] merge request comments
  - [x] labels
  - [x] milestones
  - [x] snippets
  - [x] releases
  - [x] events
  - [x] commit statuses
  - [x] CI builds
- File system data
  - [x] Git repository
  - [x] wiki
  - [x] uploads
  - [ ] ~~CI build traces~~
  - [ ] ~~CI build artifacts~~
  - [ ] ~~LFS objects~~
- DB configuration
  - [x] services
  - [x] web hooks
  - [x] protected branches
  - [x] deploy keys
  - [x] CI variables
  - [x] CI triggers

See merge request !3114
 2016-06-17 15:35:27 +00:00
James Lopez 2d4556c5d2 a few changes based on MR feedback 2016-06-17 15:47:00 +02:00
James Lopez 4bde59341f lots of refactoring again based on feedback. Changed the UI slightly and also fixed a small bug 2016-06-15 17:31:00 +02:00
James Lopez 36ccaca35a project export archiver 2016-06-14 22:11:21 +02:00
James Lopez 9ecebaaea1 adding notifications stuff and more refactoring for exporting projects 2016-06-14 16:31:03 +02:00
James Lopez 3f7ed55011 lots of refactoring to reuse import service 2016-06-14 12:47:07 +02:00
Fatih Acet 046b5735bc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplete_for_labels 
# Conflicts:
#	app/assets/javascripts/gfm_auto_complete.js.coffee
 2016-06-14 00:56:59 +03:00
James Lopez e83fc684a5 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 
# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb
 2016-06-13 14:00:19 +02:00
Rui AndersonandRémy Coutable 07dbd6b388 Allow or not merge MR with failed build 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 14:36:54 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Yorick Peterse 86166d2802 Split Markdown rendering & reference gathering 
This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.
 2016-05-26 17:14:00 +02:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Douwe Maan ba5b47c2e3 Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' 
Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897
 2016-05-20 21:08:57 +00:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 23:40:33 -05:00
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
 2016-05-18 13:05:53 -05:00
Felipe Artur c2c7014e01 Improve documentation and add changelog 2016-05-17 21:53:04 -05:00
Felipe Artur 07ff874f57 Let users set notification levels in projects which they are not members 2016-05-17 21:53:03 -05:00
James Lopez 8c508037a6 updated controllers with permissions check 2016-05-13 17:03:03 +02:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Zeger-Jan van de Weg 3bdc57f0a7 Create table for award emoji 2016-05-06 10:47:11 +02:00
James Lopez bd2ebf37e6 use worker in controller 2016-05-04 10:57:09 +02:00
Arinde Eniola 14964308dc add gfm autocomplete for labels 2016-05-03 12:07:06 +01:00
Kamil Trzcinski 03b3fe13f6 Make images_enabled configurable 2016-04-29 16:45:00 +02:00
James Lopez c5bc262981 few fixes - import from UI working 2016-04-28 18:00:30 +02:00
James Lopez a0ede57dd6 Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental 2016-04-22 15:29:35 +02:00
Alejandro Rodríguez 4cab66e3e2 Implementing autocomplete for GFM milestone references 2016-04-20 22:12:43 -03:00
James Lopez 05edd5e6dc download export now working 2016-04-15 15:38:34 +02:00
James Lopez 41163fd552 some experimental UI stuff to test export 2016-04-14 18:01:21 +02:00
Douglas Barbosa Alexandre 635b65d120 Add method to return the user notification setting for a group, or a project 2016-04-08 18:46:45 -03:00
Douglas Barbosa Alexandre ee497599cc Use default_value_for to set default NotificationSetting#level 2016-04-08 17:24:27 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Stan Hu 934f1e9097 Fix Error 500 after renaming a project path 
Closes #14885
 2016-04-05 11:18:13 -07:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master' 
Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189
 2016-04-04 15:37:08 +00:00
Yorick Peterse 5830d80b8d Pre-calculate Emoji digests 
By pre-calculating the digests we can manually construct the emoji URLs,
removing the need for using Rails' asset URL helpers. The reason we
don't want to use these helpers for Emojis is two-fold:

1. Rails' image_url() method is slow, really slow. For one it _might_
   have to calculate digests but it also performs a lot of other
   intensive operations (judging by the source code and based on
   measuring timings).

2. We have a lot of Emoji which coupled with the above can result in it
   taking minutes to load Emoji autocomplete data.

Using this pre-calculation setup generating the digests takes around 7
seconds (including the time it takes to start Rails/Rake), and only
around 600 milliseconds to load _all_ the autocomplete data of a project
(measured locally).

This commit _does_ change the Emoji URLs from absolute to relative URLs
as these are much easier to generate.

To update the Emoji data simply run:

    rake gemojione:digests

Then commit any changes.

Fixes gitlab-org/gitlab-ce#14009
 2016-03-30 19:29:17 +02:00
Dmitriy Zaporozhets 5583197e09 Create NotificationSettings object only when user change value in dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 71e7b39843 Refactor creating notification setting with defaults 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 359157c097 Introduce NotificationSetting to user interface 
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Baldinof fa4126acff Move unlink fork logic to a service 2016-03-22 15:34:35 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douglas Barbosa Alexandre 7ee528336a Restrict access for confidential issues on autocomplete 2016-03-17 20:55:59 -03:00
Jacob Vosmaer 30b36c92c3 Use an exception to pass messages 2016-03-15 11:03:43 +01:00