home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,148 Commits 48 Branches 340 Tags
efde96e9cd4b0096c19ecfa46237b7eda28038aa
Commit Graph
385 Commits
Author SHA1 Message Date
James Lopez ba1fcf3619 added commits and merge request diffs to export 2016-03-14 12:29:46 +01:00
James Lopez 5fbcfab63f Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-03-14 11:26:34 +01:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
James Lopez cc8aafeded typo 2016-03-10 18:41:57 +01:00
James Lopez a7acfa6614 add project members to export 2016-03-10 16:29:38 +01:00
Yorick Peterse 53719ecb80 Handle permissions for ExternalIssue instances 
This fixes the remainder of the GitPushService specs.
 2016-03-09 17:10:43 +01:00
Yorick Peterse 96d35c5975 Fixed part of the GitPushService specs 
These were broken by commit 21a05328ff.
Two JIRA tests remain broken but I can't quite figure out how to fix
them.
 2016-03-09 17:10:43 +01:00
James Lopez 4b88b4ffd5 fix wiki path issues and spec 2016-03-09 10:35:38 +01:00
Robert Speicher b900304c38 Make better use of the visibility_level factory traits 2016-03-08 16:40:45 -05:00
Yorick Peterse cb5a5ba095 Cache & flush tag/branch counts 
The methods used for this are Repository#tag_count and
Repository#branch_count which cache their output in Redis as well as
memoizing it in an instance variable. Both methods have a corresponding
methods/hooks to flush the caches at the right time.
 2016-03-08 18:19:40 +01:00
James Lopez 99d87d8698 WIP - added wiki repo bundler 2016-03-08 18:17:57 +01:00
James Lopez 556cafa44e added repo bundler spec and refactored some of the export code 2016-03-08 15:53:32 +01:00
James Lopez 4e73f9827c WIP - started working on bundle the repo, refactored some stuff and updated spec 2016-03-08 12:35:37 +01:00
James Lopez 68eae04538 finish project tree saver spec 2016-03-08 10:21:02 +01:00
tiagonbotelhoandYorick Peterse 4929592458 adds test for git push service for updating the language of the project 2016-03-07 21:59:39 +01:00
James Lopez e228453f47 updated spec 2016-03-07 19:14:06 +01:00
James Lopez f9eb3fc0aa WIP - initial export service and spec 2016-03-07 18:26:15 +01:00
Dmitriy Zaporozhets 954b98377f Merge remote-tracking branch 'origin/issue_5854' 2016-03-04 14:29:57 +01:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Rubén Dávila eb068b0fff Add commit message to JIRA's notification payload. 2016-03-03 09:55:53 -05:00
Douglas Barbosa Alexandre c1482943c4 Does not create a todo when commenting on commit or project snippet 2016-02-24 21:09:40 -03:00
Kamil Trzcinski 7c288c07f1 Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01:00
Douglas Barbosa Alexandre 04d1b41258 Merge branch 'tasks' into 'master' 
Add Todos

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

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
 2016-02-22 02:36:41 +00:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre ce78813c2a Create or mark task pending as soon the action happens 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre fc3f8a8ff7 Ensure that we only have one task per issue/mr 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 4465613647 Explicit mention of the assignee make a task 
Since potentially the previous assign-task has already been handled.
 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 139c513da6 Fix rubocop offenses 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 3b98adcc75 Create a pending task when a user is mentioned when edit a issue/mr/note 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 4120b7941d Does not create a task if new assignee is the current user 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 1d476b0656 Create a pending task when a user is mentioned on a note 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 14fc05ebfd Create a pending task when a user is mentioned on issue/mr 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 4bfc377ff6 Rename TaskService#mark_as_done to mark_pending_tasks_as_done 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 372cdf4ce5 Marks pending tasks for an user as done when he merge the MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre c86b12bf69 Marks pending tasks for an user as done when he close the MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7bed6ee21d Marks pending tasks for an user as done when he edit a MR 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 802bf6d012 Create a pending task when an MR is assigned to someone 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 9da03c45c9 Mark pending tasks for the current user as done when he edit a note 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 49cd19652a Mark pending tasks for the note author as done when he left a note 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre a56ada0a1e Marks pending tasks for an user as done when he close the issue 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre e81061a211 Marks pending tasks for an user as done when he edit an issue 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre c8f2d18abd Does not create a task for new issue when assignee is the current user 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 422a01fc85 Create a pending task when an issue is assigned to someone 2016-02-20 12:10:26 -02:00
Kamil Trzcinski 6febe1007e Discover branches for commit statuses ref-less when doing merge when succeeded 2016-02-19 23:24:31 +01:00
Kamil Trzcinski 56449cc674 Fix Merge When Succeeded for multiple stages 
Use around_transition to trigger build creation for next stages
 2016-02-19 23:24:31 +01:00
Kamil Trzciński c0f549a95b Merge branch 'fix/ci-first-job-allow-failure' into 'master' 
Fix CI builds scheduler when first build in stage is allowed to fail

This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.

Closes #3192

See merge request !2869
 2016-02-18 14:28:25 +00:00
Grzegorz Bizon 0ae7c95453 Add specs for build status helper class 2016-02-18 10:52:57 +01:00
Douwe Maan 52a8d1f3c6 Merge branch 'fix/gitpushservice-complexity-issue' into 'master' 
Reduce code complexity on GitPushService#execute

Code complexity for gitlab-ce after this has been refactored:
```
  27.3: GitPushService#execute
```
This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that?

I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles.

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


See merge request !2784
 2016-02-18 09:33:21 +00:00
Grzegorz Bizon 364072b7d0 Return a builds array in builds create service 2016-02-18 10:29:20 +01:00
James Lopez c110c9bd7f refactored spec 2016-02-17 18:29:43 +01:00