home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
2049 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Douwe Maan 78fba275c9 More textual tweaks 2015-08-09 17:46:25 +02:00
Douwe Maan 7b7802377e Merge branch 'master' into mr-widget-text 2015-08-09 17:40:59 +02:00
Douwe Maan 211fe02848 Tweak MR widget text some more. 2015-08-08 21:51:50 +02:00
Douwe Maan b2334da40e Improve text in MR "How To Merge" modal. 2015-08-08 21:51:42 +02:00
Douwe Maan b8590da024 Improve MR merge widget text and UI consistency. 2015-08-08 21:24:43 +02:00
Dmitriy Zaporozhets 1c3c232608 Revert "Put author name at the end of a tree row" 
This reverts commit ee0fc2c3ad.
 2015-08-07 18:12:15 +02:00
Dmitriy Zaporozhets 4773f38e28 Merge branch 'improve-merge-requests' into 'master' 
Improve merge requests

- [x] Fetch merge request refs by IID
- [x] Ability to fetch any merge request
- [x] Link commits and diffs in merge request to target project
- [x] Improve merge request UI and command line instructions
- [x] Check merge request widget loading test coverage double

See merge request !1115
 2015-08-07 14:44:54 +00:00
Dmitriy Zaporozhets fd2f907b01 Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 16:04:17 +02:00
Dmitriy Zaporozhets 3cf4a981d6 Refactor merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 15:17:10 +02:00
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets fe4b065202 Link mr commits/diffs to target project 
Now when changes in merge requests stored in target project we can
always link commits and diffs to target project. So even people without
access to fork can browse commits and diffs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 13:05:52 +02:00
Stan Hu a1e6fc157f Merge branch 'issue-2216' into 'master' 
Diff colors on MR Discussion like on Changes-tab

Fixes #2216

# Before
![Screen_Shot_2015-08-06_at_21.44.58](https://gitlab.com/gert/gitlab-ce/uploads/ed5935e0713dd58f9cd4b17a1fecaa86/Screen_Shot_2015-08-06_at_21.44.58.png)

# After
![Screen_Shot_2015-08-06_at_21.44.33](https://gitlab.com/gert/gitlab-ce/uploads/0816360afcc7cf860d2eadf8dd63b49e/Screen_Shot_2015-08-06_at_21.44.33.png)

See merge request !1108
 2015-08-07 04:28:10 +00:00
Dmitriy Zaporozhets 5fb5fd253a Merge branch 'nicer-merge-conflicts-widget' into 'master' 
Split merge conflict messages on 2 lines

Before

![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png)

After

![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png)


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !1107
 2015-08-06 20:35:36 +00:00
Gert Goet 7d2259b36f Diff colors on MR Discussion like on Changes-tab 
Fixes #2216
 2015-08-06 21:39:22 +02:00
Dmitriy Zaporozhets ab6aa8a48b Split merge conflict messages on 2 lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 17:22:45 +02:00
Douwe Maan e2b4f13b9b Add project name to project head 2015-08-06 15:10:51 +02:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Dmitriy Zaporozhets 4b3b286eef Merge branch 'tree-author-at-end' into 'master' 
Put author name at the end of a tree row

Put author name at the end of a tree row as the commit message is more important than the author name.

See merge request !579
 2015-08-06 08:59:25 +00:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Kamil Trzciński caf4c0dd87 Merge branch 'ci-skipped-status' into 'master' 
Added support for CI skipped status

This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216


See merge request !1073
 2015-08-05 10:09:07 +00:00
Dmitriy Zaporozhets 6caa03d422 Merge remote-tracking branch 'public/project-buttons' 2015-08-05 11:18:28 +02:00
Sven Strickroth ee0fc2c3ad Put author name at the end of a tree row 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-05 00:12:13 +02:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Douwe Maan 58c76605b3 Merge branch 'update-mr-branch-text' into 'master' 
Update merge request text to reflect editability of source/target branch

Screenshot 1 (source branch deleted):

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png)

Screenshot 2 (target branch deleted):

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/acec96c12d40175301ce4d4405137348/image.png)

Closes #2134

See merge request !1085
 2015-08-04 09:01:54 +00:00
Stan Hu 8221236df1 Update merge request text to reflect editability of source/target branch 
Closes #2134
 2015-08-03 07:11:04 -07:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan 7ba7652019 Tweak project page buttons. 2015-07-31 13:56:15 +02:00
Douwe Maan 0b5acdd88f Show buttons to add license, changelog and contribution guide if they're missing. 2015-07-30 15:12:57 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Stan Hu 369275d630 Fix network graph when branch name has single quotes 
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
 2015-07-29 23:29:47 -07:00
Job van der Voort f21ac8f5c6 Merge branch 'timestamp-wikis' into 'master' 
Added a timestamp to the wikis page just below the title

Now it looks like this:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png)



See merge request !1055
 2015-07-28 13:47:25 +00:00
Douwe Maan 4fae34d629 Merge branch 'fix-quotes-in-branch' into 'master' 
Fix commit data retrieval when branch name has single quotes

Quotes in ref names need to be escaped properly in JavaScript.

Closes #1724

See merge request !1046
 2015-07-28 09:13:52 +00:00
Darby 30b2a95b4d Added a timestamp to the wikis page just below the title 2015-07-27 17:41:31 -04:00
Robert Speicher 7679a7ea55 Render Note field hints consistently for "new" and "edit" forms 
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
  didn't.

Closes #2010

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
 2015-07-26 16:55:43 -04:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes 
Closes #1724
 2015-07-26 03:47:01 -07:00
Stan Hu 4a76cbe219 Merge branch 'fix-reload-with-full-diff-url' into 'master' 
Fix the "Reload with full diff" URL button

On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.

Closes #2041

See merge request !1019
 2015-07-25 15:38:23 +00:00
Stan Hu 71a8c780ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-24 14:39:04 -07:00
Robert Speicher cad0e848b0 Fix and style the "Changes suppressed" link. 2015-07-23 16:07:45 -04:00
Stan Hu ae3f869fd1 Fix the "Reload with full diff" URL button 
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
 2015-07-23 12:53:54 -07:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Valery Sizov 6454bcbfa4 revert cache issue 2015-07-22 17:53:18 +03:00
ngentile dbff6bc106 Gitlab Issue 707: Indent unfolded code 1 character 2015-07-22 09:58:17 -04:00
Hannes Rosenögger bf3b318ec5 revert caching of note text 2015-07-21 13:59:14 +02:00
Stan Hu 3522018db3 Merge branch 'mr-fetch-command' into 'master' 
merge_requests: add fetch command to the MR page

In our instance, users asked for an easy way to get the contents of the MR into their local clone. This adds a command line which can be used to fetch the contents of the MR.

Screenshot:

![fetch-command](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d83acfbdb69f023d13b45dff5d583ac1/fetch-command.png)

See merge request !678
 2015-07-20 16:40:24 +00:00
Valery Sizov e80bfcc573 Approvals fixes 2015-07-20 18:28:37 +03:00
Ben Boeckel 374b95c38e merge_requests: add fetch command to the MR page 2015-07-20 11:23:27 -04:00