Software Publico / Gitlab

02 Dec, 2013

1 commit

e3464a54 Remove .js format for MergeRequest controller ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-12-02 14:27:36 +0200

15 Nov, 2013

1 commit

adb58e36 Merge pull request #5557 from dpursehouse/merge-status-message-improvement ... Browse Dir »
```
Improve status message on merge request page
```
Dmitriy Zaporozhets
2013-11-15 03:55:18 -0800

12 Nov, 2013

2 commits

d89c6adf Improve select UI ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2013-11-12 22:32:28 +0200

dfb8d2b7 Improve status message on merge request page ... Browse Dir »

The status message currently looks like:

  Created on Oct 24, 2013 by John , currently assigned to Bob

There is a space between the author name and the comma, which is
incorrect.  Also, there is no period at the end of the sentence,
which makes it inconsistent with the following line:

  Merged by Bob 5 minutes ago.

Change it to:

  Created on Oct 24, 2013 by John.  Currently assigned to Bob.

Also change the milestone information from:

  and attached to milestone XYZ

to:

  Attached to milestone XYZ.

2013-11-12 18:24:03 +0900

23 Oct, 2013

1 commit

03dec79c Fix some more instances of "Created at" ... Browse Dir »
```
"Created on" should be used when the timestamp is only a date.
```
David Pursehouse
2013-10-23 10:15:08 +0900

19 Oct, 2013

1 commit

53564d90 A few other iids instead of ids (mostly in edit forms) Browse Dir »

Romain
2013-10-19 09:23:51 +0200

16 Oct, 2013

1 commit

9afc930b Make ui-box-show more visible. Refactor some css classes Browse Dir »

Dmitriy Zaporozhets
2013-10-16 20:42:42 +0300

09 Oct, 2013

1 commit

65cad57a avatar upload on profile page Browse Dir »

Steven Thonus
2013-10-09 09:05:09 +0200

09 Sep, 2013

1 commit

e0ca2ada Improve Merge Request form ... Browse Dir »
```
* added description
* simplified form
* enabled gfm autocomplete
```
Dmitriy Zaporozhets
2013-09-09 17:11:58 +0300

25 Aug, 2013

1 commit

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

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

19 Aug, 2013

1 commit

608f3286 Show iid as default id for issues, mr Browse Dir »

Dmitriy Zaporozhets
2013-08-19 22:12:40 +0300

15 Aug, 2013

2 commits

0b432493 A couple of small wording improvements for the merge request approval page Browse Dir »

Henry Smith
2013-08-15 19:01:05 +0100

4b91ffca More specific empty state message wording ... Browse Dir »

I've changed all the instances of "Nothing to show here" to specifically mention
the name of the entity of which there are none to show. This makes for a
slightly smoother reading experience.

2013-08-15 18:31:16 +0100

12 Aug, 2013

1 commit

083990c7 Minor UI improvements Browse Dir »

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

10 Aug, 2013

2 commits

80ee5ed8 Remove unused files Browse Dir »

Dmitriy Zaporozhets
2013-08-10 20:26:58 +0300
3281021e Rewrite issues/mr filtering logic Browse Dir »

Dmitriy Zaporozhets
2013-08-10 20:25:53 +0300

08 Aug, 2013

8 commits

5c44623b quickfix Browse Dir »

Dmitriy Zaporozhets
2013-08-08 23:38:41 +0300
8e6ffa1e Fix form mr issue with ci Browse Dir »

Dmitriy Zaporozhets
2013-08-08 23:34:36 +0300
869f45b3 Fix assign-to-me buttton Browse Dir »

Dmitriy Zaporozhets
2013-08-08 21:26:13 +0300
f0e994b6 improve MergeRequest edit page Browse Dir »

Dmitriy Zaporozhets
2013-08-08 21:11:28 +0300
7fefb039 Fix filter context. Dont duplicate target project name for MR Browse Dir »

Dmitriy Zaporozhets
2013-08-08 17:29:31 +0300
02c3bb7a fix chosen ui. fixed network tests Browse Dir »

Dmitriy Zaporozhets
2013-08-08 16:14:38 +0300
ca52f848 Update chosen, improve ui, fix MR fork tests Browse Dir »

Dmitriy Zaporozhets
2013-08-08 15:14:59 +0300

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

07 Aug, 2013

3 commits

2e0a3734 Merge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq Browse Dir »

Dmitriy Zaporozhets
2013-08-07 20:55:39 +0000
89d0d75c Better filter var for MR. show reset filter only if makes sense Browse Dir »

Dmitriy Zaporozhets
2013-08-07 23:54:26 +0300
f2082edb use control-group classes for inline forms in issues/mr Browse Dir »

Dmitriy Zaporozhets
2013-08-07 23:22:46 +0300

01 Aug, 2013

3 commits

e8347424 Dont load bootstrap buttons. Modified css with new buttons Browse Dir »

Dmitriy Zaporozhets
2013-08-01 22:35:40 +0300
3e9460b6 Fix minor wording Browse Dir »

Dmitriy Zaporozhets
2013-08-01 16:11:50 +0300
ce5fca48 Fix MR modal Browse Dir »

Dmitriy Zaporozhets
2013-08-01 15:59:57 +0300

30 Jul, 2013

2 commits

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

29 Jul, 2013

1 commit

2c6577a1 Suggest MR title based on from branch Browse Dir »

Dmitriy Zaporozhets
2013-07-29 21:17:46 +0300

18 Jul, 2013

1 commit

4d373005 Rebase on master ... Browse Dir »

-Messed up part of the merge for _form.html.haml
-Probably need discussion about what the new/edit merge page should look like now that it involves projects

Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1

2013-07-18 00:12:03 -0400

17 Jul, 2013

6 commits

0a013adc Fix an issue with edits sending user back to @source_project ... Browse Dir »

-Form was for @source_project rather then @project.
-add spinach test for edit submission on forked project

Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e

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

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

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

128f2845 Rebased on 6.0 ... Browse Dir »
```
-Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
```
Izaak Alpert
2013-07-17 22:46:38 -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

bbef8bb5 MR on fork validation error ... Browse Dir »
```
Wasn't setting fields so validations would fail

Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
```
Izaak Alpert
2013-07-17 22:45:03 -0400