home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
1908 Commits
Author SHA1 Message Date
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 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
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
Ben Boeckel 374b95c38e merge_requests: add fetch command to the MR page 2015-07-20 11:23:27 -04:00
Valery Sizov 922b738ae5 Merge branch 'remove-redundant-last-push' into 'master' 
Remove redundant last push event if activity feed is set to main page

### What does this MR do?

This MR eliminates a redundant last push event message if the user's preferences are set to the main activity feed.

### Why was this MR needed?

Lots of wasted space was introduced as a result.

### Screenshots

#### Before

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

#### After

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

### What are the relevant issue numbers?

Closes #2009

See merge request !995
 2015-07-20 12:12:24 +00:00
Stan Hu 682c0deffe Remove redundant last push event if activity feed is set to main page 
Closes #2009
 2015-07-18 08:02:38 -07:00
Stan Hu 875d8e7f31 Fix bug where notes were being rendered with wrong color preferences due to caching 
Closes #2008
 2015-07-18 07:32:18 -07:00
Stan Hu a84ed6eb23 Merge branch 'add-support-remove-milestone' into 'master' 
Add support for destroying project milestones

### What does this MR do?

This MR adds a "Remove" button to the project milestones page and the milestone page itself.

### Why was this MR needed?

Because lots of people talked about needing to clean their toilets. :)

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/1504

### Screenshots

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

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

See merge request !980
 2015-07-17 17:15:27 +00:00
Stan Hu df2bb60f90 Add support for destroying project milestones 
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
 2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 971e47520f Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:32:43 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Valery Sizov d2479a25c7 Time ago fix for compare page 2015-07-15 16:59:31 +03:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 5c53dc5a1e Merge branch 'project-default-view' into 'master' 
Allow user to specify content he wants to see on project page

Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.

User can specify which content he/she wants to see:

![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png)

![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png)

cc @JobV @jacobvosmaer @marin @sytses

See merge request !970
 2015-07-14 08:30:46 +00:00
Dmitriy Zaporozhets fd84567545 Improve project new item dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 23:36:21 +02:00
Dmitriy Zaporozhets 67c17df221 Better wording for project dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:04:48 +02:00
Dmitriy Zaporozhets 78a94027ea Add dropdown to quickly create issue or branch from project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:42:07 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Stan Hu ea5e5ee4dc Merge branch 'fix-migrating-from-svn-doc-link' into 'master' 
Fix migrating from SVN document link

Closes #1959

See merge request !958
 2015-07-10 16:23:18 +00:00
Stan Hu 18f6cf33ef Fix migrating from SVN document link 
Closes #1959
 2015-07-10 09:20:24 -07:00
Dmitriy Zaporozhets 37cdffd98b Make edit/remove label buttons smaller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 14:27:12 +02:00
Dmitriy Zaporozhets bda04bc687 Merge branch 'fork_visibility_level' into 'master' 
Forks should not have more permissive visibility levels than the original

https://dev.gitlab.org/gitlab/gitlabhq/issues/2286

See merge request !936
 2015-07-10 12:05:54 +00:00
Dmitriy Zaporozhets fdbaffdc08 Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce 2015-07-10 13:13:02 +02:00
Darby 360ee25ddb Fixed the issues 2015-07-09 13:38:33 -07:00
Dmitriy Zaporozhets 6e0c596a1c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-09 15:15:45 +02:00