Software Publico / Gitlab

21 Aug, 2013

4 commits

e67574fe Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit ... Browse Dir »
```
Render not found when failing to look for commit
```
Dmitriy Zaporozhets
2013-08-21 04:11:52 -0700

1101ceb3 A little improvement ... Browse Dir »

1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.

2013-08-21 19:20:29 +0900

625fb2f2 Add iids to milestones. Moved iids logic to separate concern Browse Dir »

Dmitriy Zaporozhets
2013-08-21 12:16:26 +0300
5f24bdb7 Render not found when failing to look for a commit Browse Dir »

Hiroyuki Sato
2013-08-21 17:53:51 +0900

20 Aug, 2013

5 commits

0a44ecf3 Fix migrate_iids for issues Browse Dir »

Dmitriy Zaporozhets
2013-08-20 22:41:05 +0300
395f3a1d Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq Browse Dir »

Dmitriy Zaporozhets
2013-08-20 19:30:38 +0000
9acaec7a Searching for issue/mr by iid in markdown Browse Dir »

Dmitriy Zaporozhets
2013-08-20 17:31:26 +0300
a442ad2b Added Gitlab::Access module Browse Dir »

Dmitriy Zaporozhets
2013-08-20 15:59:26 +0300
b66f4898 Better message for migrating global projects Browse Dir »

Dmitriy Zaporozhets
2013-08-20 12:40:51 +0300

19 Aug, 2013

3 commits

7c55c73d Fix confusing situation where install guide told you to install init.d script for puma. Browse Dir »

Sytse Sijbrandij
2013-08-19 21:54:12 +0200

434c0341 Iid improvemets ... Browse Dir »

* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard

2013-08-19 22:53:11 +0300

2e5481b7 Create task to create iid for existing issues/mr Browse Dir »

Dmitriy Zaporozhets
2013-08-19 22:11:18 +0300

15 Aug, 2013

1 commit

39d8a64d Fixes grack authentification under relative_url_root ... Browse Dir »

Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)

2013-08-15 21:25:09 +0200

14 Aug, 2013

2 commits

d6aec3fc Allow specify path when create project via api Browse Dir »

Dmitriy Zaporozhets
2013-08-14 13:41:06 +0300
a6e57749 Use native repo path for import task. Skip wiki repos Browse Dir »

Dmitriy Zaporozhets
2013-08-14 12:45:17 +0300

13 Aug, 2013

1 commit

7825830c Allow project name, path etc start with number. Fixed specs Browse Dir »

Dmitriy Zaporozhets
2013-08-13 12:24:10 +0300

08 Aug, 2013

2 commits

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

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

c7e490eb Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork Browse Dir »

Dmitriy Zaporozhets
2013-08-08 12:12:46 +0300

05 Aug, 2013

3 commits

bb5e50e0 Fix edit files Browse Dir »

Dmitriy Zaporozhets
2013-08-05 16:55:15 +0300
b9265566 Update main calls to gitlab_git Browse Dir »

Dmitriy Zaporozhets
2013-08-05 16:51:04 +0300
02e859a2 move backup logic to lib. Fixed removing outdated backups Browse Dir »

Dmitriy Zaporozhets
2013-08-05 12:26:33 +0300

04 Aug, 2013

3 commits

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

Dmitriy Zaporozhets
2013-08-04 20:43:49 +0300
2d75b454 Store diff with line note. It makes possible to see inline notes with proper dif… ... Browse Dir »
```
…f even if MR diff changed
```
Dmitriy Zaporozhets
2013-08-04 19:01:57 +0300
49709b1d Fix broken user link in email Browse Dir »

Dmitriy Zaporozhets
2013-08-04 16:27:32 +0300

02 Aug, 2013

2 commits

0ef0150d Merge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq Browse Dir »

Dmitriy Zaporozhets
2013-08-02 13:47:25 +0000
1dda34f3 Delete duplicate keys in migrate_keys task Browse Dir »

Jacob Vosmaer
2013-08-02 15:43:30 +0200

30 Jul, 2013

7 commits

9a900dbb Removed some debug code ... Browse Dir »
```
Change-Id: Ibd0088f498faccc72acda2783b61bbea19bd835d
```
Izaak Alpert
2013-07-30 16:19:17 -0400
7856fba3 Updated format_patch to use '..' rather than '...' ... Browse Dir »
```
Was incorrectly including commits reachable from rev2.

Change-Id: I3560e5d5ce474ba3d374f29ae16190b1f74989be
```
Izaak Alpert
2013-07-30 16:13:01 -0400
e08f977b Add 'repository' to path blacklist, fixes #4591 Browse Dir »

Robert Schilling
2013-07-30 20:23:30 +0200
d19d094b Remove ugly button and truncate too long project names. Remove unecessary newlines Browse Dir »

Dmitriy Zaporozhets
2013-07-30 14:12:24 +0300
0d715bcd Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork ... Browse Dir »
```
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
```
Dmitriy Zaporozhets
2013-07-30 13:35:33 +0300
e03d01d0 extract server-side git commands to constants Browse Dir »

Jakub Zienkiewicz
2013-07-30 10:15:36 +0200
5e35f216 allow all git-upload-* commands for deploy keys Browse Dir »

Jakub Zienkiewicz
2013-07-30 10:15:36 +0200

29 Jul, 2013

1 commit

cd19f82e Fix typos Browse Dir »

Johannes Schleifenbaum
2013-07-29 12:47:06 +0200

18 Jul, 2013

1 commit

475f607a Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stor… ... Browse Dir »
```
…ed in different location
```
Dmitriy Zaporozhets
2013-07-18 13:55:01 +0300

17 Jul, 2013

5 commits

58064027 Raise Error for diff_between/commit_between for non fork mr's in satellite ... Browse Dir »

-Fixed tests to account for this
-Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup

Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5

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

fae3f466 Refactor merge api create ... Browse Dir »

-Made the api method a little more readable
-removed some missed extra newline's

Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5

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

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

-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 Dir »

-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

5d56da6b MR on fork: Some cleanup, test updates ... Browse Dir »

-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
-Removed todo in merge_request, pushed wrapping of grit down to the satellite
-updated action test to check flock status, made it nolonger pending
-moved all logging on failure to helper method in satellite
GITLAB-592

Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75

2013-07-17 22:42:51 -0400