home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,223 Commits 48 Branches 340 Tags
ac7cea308467709413f7a67b9e95fd0a0e2dcafe
Commit Graph
159 Commits
Author SHA1 Message Date
Rémy Coutable a600097188 Merge branch 'fix/error-typo' into 'master' 
fix import/export error typo

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18948

See merge request !4847

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-22 15:38:00 +02:00
Douwe MaanandRobert Speicher bf0294378e 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 14:18:15 -04:00
Rémy Coutable 515205d3c1 UI and copywriting improvements 
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:18:14 +02:00
Rémy Coutable 6d103a2f47 Factorize members mails into a new Emails::Members module 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
Rémy Coutable d26f81239a Add request access for groups 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
David AlexanderandRémy Coutable 17c22156c5 Initial implementation of user access request to projects 2016-06-14 12:12:02 +02:00
Kamil Trzcinski 9614c52266 Fix tests offenses: use pipeline of Ci::Build and rename views 2016-06-06 11:19:54 +02:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views 
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
 2016-05-26 17:14:06 +02:00
Sean McGivern a9977f2b7a Syntax-highlight diffs in push emails 
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
 2016-05-17 13:23:17 +01:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Stan Hu f64b82e1da Support e-mail notifications for comments on project snippets 
Closes #2334
 2016-05-02 11:01:32 -07:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Grzegorz Bizon 15d32b6a11 Add new notifications for issue move action 
[ci skip]
 2016-03-17 07:39:16 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation 
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
 2016-03-15 18:22:02 +01:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels 
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
 2016-03-15 17:25:37 +01:00
Grzegorz Bizon c9f202b2ef Fix broken link in CI build notification emails 
Closes #13199
 2016-02-12 14:01:27 +01:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Robert Speicher 6344493655 Use to_s(:iso8601) where appropriate 2016-01-07 20:01:08 -05:00
Job van der Voort ddd806c66f Revert "Make sure notify email always has author info." 
This reverts commit 303f79f804.
 2015-12-15 16:45:52 +01:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master' 
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
 2015-12-14 10:35:40 +00:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master' 
Ci Services migrate



See merge request !1985
 2015-12-14 10:32:57 +00:00
Stan Hu 885bfe3bdc Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages 
Make sure notify email always has author info.
 2015-12-11 23:40:22 -08:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Grzegorz Bizon 9f2752e5dc Remove obsolete variables in repository_push_email 2015-12-08 08:43:08 +01:00
Jason Lee 303f79f804 Make sure notify email always has author info. 2015-11-18 17:10:04 +08:00
Gert Goet 41734b630e Ensure variable is evalled 2015-10-29 14:14:21 +01:00
Douwe Maan 4f629dab2a Merge branch 'master' into rs-redactor-filter 2015-10-07 15:15:35 +02:00
Dmitriy Zaporozhets 958e727f70 Merge branch 'fix-email-typo' into 'master' 
notify: fix typo in merged_merge_request_email template

All (two) other templates with this line use 'url' rather than 'Url'.

See merge request !1151
 2015-10-01 15:00:22 +00:00
Valery Sizov 5b57313051 Note the original location of a moved project when notifying users of the move 2015-10-01 09:54:56 +03:00
Ben Boeckel e97349cb42 notify: fix typo in merged_merge_request_email template 
All (two) other templates with this line use 'url' rather than 'Url'.
 2015-09-30 17:14:54 -04:00
Stan Hu b71a9fcdeb Fix HTML link that was improperly escaped in new user e-mail 
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
 2015-09-16 21:24:53 -07:00
Robert Speicher 4883785083 Remove last remaining reference_only_path usages 2015-09-03 17:47:27 -04:00
Steve Norman 10871732df Use entity number for plus sign 2015-05-27 13:04:18 +00:00
Robert Speicher cc0f223858 Merge branch 'fix-typo-in-email' into 'master' 
Fix "Asignee" typo in new issue/merge request emails

See merge request !676
 2015-05-26 21:47:04 +00:00
Ben Boeckel b8571f141e email: fix typo 2015-05-18 09:33:16 -04:00
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails 
Tell new users when their password reset token expires and provide a
link to get a new one.
 2015-05-16 14:03:07 -06:00
Douwe Maan 88c2639356 Remove superfluous info from invite accepted/declined mails. 2015-04-14 23:06:21 +02:00
Douwe Maan e50556fcc8 Let invites be declined. 2015-04-14 12:08:11 +02:00
Douwe Maan 39f389ae0f Add invites controller. 2015-04-14 12:07:33 +02:00
Hannes Rosenögger 8e9fbd847d Revert "Merge branch 'fix_email_images' into 'master'" 
This reverts commit d66148ef39, reversing
changes made to cdb64a81a8.

This change needed to be reverted,
because not enough email clients support inline images.
 2015-04-13 12:34:47 +02:00
Dmitriy Zaporozhets 18dfe0ce76 Merge branch 'emailsonpush-last-line' into 'master' 
Fix final line in EmailsOnPush email diff being rendered as error.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.

Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.

See merge request !480
 2015-04-07 09:54:23 +00:00
Douwe Maan 08eac512bd Move EmailsOnPush highlight CSS inline instead of being in every notification email. 2015-03-31 12:36:36 +02:00
Douwe Maan e08d947e77 Use relative URL for Markdown references, except in mails. 2015-03-27 10:39:05 +01:00
Douwe Maan bf235053ad Send EmailsOnPush email when branch or tag is created or deleted. 2015-03-18 14:07:28 +01:00
Dmitriy Zaporozhets aa4691acac Fix email template css for project moved emails 2015-03-17 18:38:10 -07:00
Dmitriy Zaporozhets d659c1d1fd More actively use css variabled to prevent colors duplication 2015-03-17 18:01:33 -07:00