home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,727 Commits 48 Branches 340 Tags
09f211ef4f032b7dfbc333754569896b34f0649f
Commit Graph
6527 Commits
Author SHA1 Message Date
Marin Jankovski 07925be296 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2014-11-24 11:41:27 +01:00
Drew Blessing c65e4f9449 Fix icons for enterprise project settings 2014-11-21 17:12:55 -06:00
Marin Jankovski 6bcb1a033f Add removal and addition of the user to the group membership to audit events. 2014-11-21 16:51:06 +01:00
Marin Jankovski 4713fbd239 Add removal and addition of the user to the project membership to audit events. 2014-11-21 16:08:12 +01:00
Marin Jankovski 8f1190f7c7 Use hash instead of json. 2014-11-21 15:58:21 +01:00
Marin Jankovski b68e1123fb Move event creation to service. 2014-11-21 12:32:12 +01:00
Marin Jankovski e3d96fc2da Remove table duplication. 2014-11-21 11:28:25 +01:00
Marin Jankovski f90db27e2a Add audit events feature spec for project. 2014-11-20 11:54:05 +01:00
Marin Jankovski e348c6512f Add group audit events. 2014-11-20 08:54:49 +01:00
Marin Jankovski 2d1b88c1a0 Paginate audit events page and add time column. 2014-11-19 16:32:49 +01:00
Marin Jankovski 4734c3a797 Create an audit events overview on the project settings page. 2014-11-19 16:18:30 +01:00
Marin Jankovski bcaf86da60 Add a route to project audit_events. 2014-11-19 16:16:46 +01:00
Marin Jankovski b722baeec1 Audit and Security event models. 2014-11-19 16:07:15 +01:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Valery Sizov 5ab3adb432 Improve git hook description 2014-11-17 13:52:34 +02:00
Dmitriy Zaporozhets 75c3dc9efc Merge branch 'sidekiq_gc_start' into 'master' 
Run 'GC.start' after every EmailsOnPushWorker job

This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com.

See merge request !1257
 2014-11-14 14:48:30 +00:00
Dmitriy Zaporozhets a69249d9de Merge branch 'author_attributes_clean' into 'master' 
Author attributes clean

See merge request !1254
 2014-11-14 14:10:03 +00:00
Jacob Vosmaer c10f61802b Run 'GC.start' after every EmailsOnPushWorker job 2014-11-14 12:22:22 +01:00
Marin Jankovski ced2438312 Clean the string with commit author and email. 2014-11-14 11:08:58 +01:00
Marin Jankovski 334fe86574 Sanitize branch name and ref name 2014-11-13 16:20:43 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master' 
Actions in the inbox

Related to #1607

See merge request !1247
 2014-11-12 14:57:38 +00:00
Dmitriy Zaporozhets 722d80739b Prevent big amount of sql queries for push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-12 13:59:25 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master' 
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
 2014-11-12 11:02:25 +00:00
Marin Jankovski 857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Dmitriy Zaporozhets 95e8f9797a Merge pull request #7617 from pkill/issue-280-commit-note-notifications 
Issue-280 Send notifications when a note is added to a commit and author...
 2014-11-12 12:17:27 +02:00
Dmitriy Zaporozhets 2350c11c87 Merge branch 'fix-deleted-fork' into 'master' 
Prevent post-receive error when push to project with dead forks

Fixes gitlab/gitlab-cloud#173

See merge request !1246
 2014-11-11 16:27:42 +00:00
Dmitriy Zaporozhets a6f48aedc3 Merge pull request #7944 from cirosantilli/new-blob-commit-below 
Move new blob commit message textarea below editor
 2014-11-11 17:22:51 +02:00
Marin Jankovski 3dcb5f8501 Include the helper for mailer, add links to emails. 2014-11-11 16:10:24 +01:00
Marin Jankovski af15447867 Create emails helper for actions links. 2014-11-11 16:09:58 +01:00
Dmitriy Zaporozhets 2139e3519b Refactor merge request refresh logic on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 16:49:26 +02:00
Dmitriy Zaporozhets ccd842c3a7 Prevent post-receive error when push to project with dead forks 
If project has open merge request from fork and this fork was removed
before merge request was closed it cause exception during push

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 14:52:30 +02:00
Valery Sizov 3aa59d369e Merge branch '7-4-stable-ee' into ee_master 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-11-11 11:35:18 +02:00
Dmitriy Zaporozhets 72922cfa27 Merge branch 'remove_unused_javascript' into 'master' 
Remove unused javascript

projects:teams:members:index doesn't exists

See merge request !234
 2014-11-10 19:45:15 +00:00
Dmitriy Zaporozhets 5ef196621e Merge branch 'better-mr-instructions' into 'master' 
Better merge request manual instructions

I noticed the current instructions for manually merging a merge request that was submitted from a fork could create unnecessary merge requests or strange history. Imagine this:

1. Alice creates a repository and commits / pushes a single commit with SHA1 `A` to `master`.
2. Bob forks this repository and creates a new branch `myfeature` on `master` (`A`)
3. Alice commits `B` to `master` (which has the parent `A`)
4. Bob creates two commits on `myfeature` `P` and `Q`.
5. Bob submits the merge request to merge his `myfeature` into Alice's `master` branch.
6. Alice follows the manual merge request instructions:
  1. `git checkout -b bob/repo-myfeature master`
  2. `git pull http://... myfeature`

The branch `bob/repo-myfeature` was created from Alice's current `master`, which was `B`. When the `pull` is executed, git will fetch Bob's branch and then merged the fetched branch `Q` into the current branch's location `B`. This creates an unnecessary merge commit from `master` into the branch Alice is trying to merge. No harm is done, but the history is a bit messier.

This is even worse if Alice has set `git pull` to rebase by default. In this case, the commit `B` is rebased on top of `Q`. When Alice checks out `master` and merges in the branch, there will actually be a duplicate `B` commit.

These new instructions instead tell the user to fetch Bob's `myfeature` branch. This will fetch the necessary commits `P` and `Q` and create a temporary ref `FETCH_HEAD` pointing to `Q`. Alice will then create her local `bob/repo-myfeature` branch starting at `FETCH_HEAD`. No unnecessary merge commits, and no accidental rebasing.

See merge request !16
 2014-11-10 19:39:25 +00:00
Ben Bodenmiller 6ace931c35 make repo name link to repo homepage 2014-11-09 03:37:56 -08:00
Nikita Verkhovin 2148e1997a Add issue edited timestamp 2014-11-08 16:54:08 +06:00
Valery Sizov b692a439e6 Jenkins service: update parser 2014-11-07 19:36:29 +02:00
Dmitriy Zaporozhets 6cac4e6271 Fix attachment misaligned in comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-07 12:51:18 +02:00
skv 9353db59a0 remove unused js 2014-11-06 22:34:41 +03:00
Dmitriy Zaporozhets 68850b73d7 Merge branch 'improve-white-code-highlight' into 'master' 
Improve white code highlight in comments and wiki

![Screenshot 2014-11-05 16.36.55](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5723848593/Screenshot_2014-11-05_16.36.55.png)

See merge request !1241
 2014-11-06 14:54:15 +00:00
Dmitriy Zaporozhets 265d624f9b Merge branch 'master' into improve-white-code-highlight 2014-11-06 15:39:02 +02:00
Dmitriy Zaporozhets 150fc0cc68 Merge branch 'master' into mentioned_inside_mr 2014-11-06 15:38:09 +02:00
Dmitriy Zaporozhets 0ce1826b44 Merge pull request #8258 from cirosantilli/factor-repo-path 
Factor using Repository#path_to_repo
 2014-11-06 10:57:05 +02:00
Dmitriy Zaporozhets 6d60762793 Merge branch 'gitlab-ci-parallel' into 'master' 
Update GitLab CI service to work with new GitLab CI

See merge request !1239
 2014-11-05 17:42:52 +00:00
Dmitriy Zaporozhets 57c7dafbfe Light gray bg for white code scheme if used in comments and wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 19:11:29 +02:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Alex Elman 383ac10ca5 Issue-280 Send notifications when a note is added to a commit and author is a group member 
This fixes a bug where commit authors weren't receiving email notifications for notes added to their commits and their membership was in the group but not the project. The fix is to look up membership via the team object which accounts for both project and group members.
 2014-11-05 10:28:59 -06:00
Dmitriy Zaporozhets c3e83d4771 Merge branch 'auth_duplication' into 'master' 
Remove unnecessary authorisations

Because we already check read_project ability in `before_filter :project`

See merge request !1240
 2014-11-05 15:23:26 +00:00