Software Publico / Gitlab

13 Dec, 2013

1 commit

63723ef6 Fix dashboard event caching Browse File »

Drew Blessing
2013-12-13 13:40:45 -0600

28 Nov, 2013

1 commit

64efc052 added thumbsup and thumsdown emoji voting with rspec tests Browse File »

vagrant
2013-11-28 20:05:37 +0000

01 Oct, 2013

1 commit

e219cf72 Annotate! Browse File »

Dmitriy Zaporozhets
2013-10-01 15:15:28 +0300

25 Aug, 2013

1 commit

c8a115c0 Link issues from comments and automatically close them ... Browse File »

Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.

2013-08-25 18:58:41 -0400

21 Aug, 2013

1 commit

8dd37afe Reannotate Browse File »

Dmitriy Zaporozhets
2013-08-21 12:34:02 +0300

08 Aug, 2013

1 commit

4537623d Merge branch 'master' into karlhungus-mr-on-fork ... Browse File »

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +0300

05 Aug, 2013

1 commit

d602d5b1 Fix find_diff for note when noteable is nil Browse File »

Dmitriy Zaporozhets
2013-08-05 12:32:24 +0300

04 Aug, 2013

3 commits

af5faaf0 Move diff parsing to own class. Correctly identify note diff line Browse File »

Dmitriy Zaporozhets
2013-08-04 20:43:49 +0300
8f05fbba Dont show comment on diff if diff line was changed after comment left Browse File »

Dmitriy Zaporozhets
2013-08-04 19:35:47 +0300
2d75b454 Store diff with line note. It makes possible to see inline notes with proper dif… ... Browse File »
```
…f even if MR diff changed
```
Dmitriy Zaporozhets
2013-08-04 19:01:57 +0300

17 Jul, 2013

3 commits

d9959427 Style changes from review with @randx ... Browse File »

-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150

2013-07-17 22:48:03 -0400

0ef055a4 MR on fork: Email fixes, style fixes ... Browse File »

-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking

GITLAB-894, GITLAB-895, (GITLAB-858)

Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e

2013-07-17 22:46:38 -0400

3d7194f0 Merge Request on forked projects ... Browse File »

The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8

2013-07-17 22:41:30 -0400

24 Jun, 2013

2 commits

d41940d3 Merge branch 'master' into 6-0-dev ... Browse File »
```
Conflicts:
	app/views/projects/issues/show.html.haml
	db/fixtures/development/09_issues.rb
	db/fixtures/development/10_merge_requests.rb
```
Dmitriy Zaporozhets
2013-06-24 22:13:00 +0300
cf35d19c Show participants on issues, including mentions, and notify email to all participants Browse File »

Javier Castro
2013-06-24 11:55:44 -0300

19 Jun, 2013

1 commit

6e35acef Annotated Browse File »

Dmitriy Zaporozhets
2013-06-19 15:40:33 +0300

04 Jun, 2013

1 commit

bcc4e4dc Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist ... Browse File »

Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb

2013-06-04 18:36:22 +0300

15 Apr, 2013

1 commit

d74d7c7c Update app code to use Gitlab::Git::Diff Browse File »

Dmitriy Zaporozhets
2013-04-15 19:02:05 +0300

04 Apr, 2013

2 commits

568ce1ed Fix notes for commits inside MR being squashed in one discussion Browse File »

Dmitriy Zaporozhets
2013-04-04 09:58:12 +0300
64fb2c59 fix not inline comments being hidden cause line_code = '' Browse File »

Dmitriy Zaporozhets
2013-04-04 09:50:18 +0300

28 Mar, 2013

1 commit

5ad4be29 remove notify checkboxes from note forms Browse File »

Dmitriy Zaporozhets
2013-03-28 15:39:18 +0200

25 Mar, 2013

1 commit

3e695acf Notes fixed Browse File »

Andrew8xx8
2013-03-25 15:58:09 +0400

17 Mar, 2013

1 commit

415bade3 Result of misspellings run. ... Browse File »

Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.

2013-03-17 19:46:54 +0000

12 Feb, 2013

1 commit

b5db5413 All scopes must be in lambdas Browse File »

Andrew8xx8
2013-02-12 11:16:45 +0400

15 Jan, 2013

2 commits

f598cc78 change logic on line_code Browse File »

Dmitriy Zaporozhets
2013-01-15 11:12:17 +0200

30227869 Merge commit 'master' into discussions ... Browse File »

Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

2013-01-15 00:52:25 +0100

05 Jan, 2013

1 commit

5a214ee6 Remove unused methods Browse File »

Dmitriy Zaporozhets
2013-01-05 13:11:15 +0200

04 Jan, 2013

1 commit

dccd8b6e Continue refactoring. Use repostory and team Browse File »

Dmitriy Zaporozhets
2013-01-04 08:43:25 +0200

03 Jan, 2013

1 commit

39ba934c REpostiry, Team models Browse File »

Dmitriy Zaporozhets
2013-01-03 21:09:18 +0200

23 Dec, 2012

1 commit

db2c1536 Merge branch 'master' into discussions ... Browse File »

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

2012-12-23 01:03:57 +0100