15 Nov, 2013
1 commit
-
Improve status message on merge request page
12 Nov, 2013
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
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.
23 Oct, 2013
1 commit
-
"Created on" should be used when the timestamp is only a date.
19 Oct, 2013
1 commit
16 Oct, 2013
1 commit
09 Oct, 2013
1 commit
09 Sep, 2013
1 commit
-
* added description * simplified form * enabled gfm autocomplete
25 Aug, 2013
1 commit
-
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.
19 Aug, 2013
1 commit
15 Aug, 2013
2 commits
-
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.
12 Aug, 2013
1 commit
10 Aug, 2013
2 commits
08 Aug, 2013
8 commits
-
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
07 Aug, 2013
3 commits
01 Aug, 2013
3 commits
30 Jul, 2013
2 commits
-
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
29 Jul, 2013
1 commit
18 Jul, 2013
1 commit
-
-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
17 Jul, 2013
7 commits
-
-Form was for @source_project rather then @project. -add spinach test for edit submission on forked project Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
-
-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
-
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
-Had to do some minor test clean up as well Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
-
-Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
-
Wasn't setting fields so validations would fail Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
-
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05