home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 51c8d037d3 Make profile navigation full wide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:39:26 +01:00
Dmitriy Zaporozhets d86e2f33a8 Increase fixed layout width to 1280px 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:33:24 +01:00
Dmitriy Zaporozhets 03a5df9974 Merge branch 'ui-right-sidebar' into 'master' 
Implement new sidebar for issue and merge request pages

This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. 
Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. 

cc @creamzy @JobV 

See merge request !2058
 2015-12-11 19:30:20 +00:00
Dmitriy Zaporozhets 7cbcc21dcc Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets 1911811438 Move awards back to gray panel and few improvements to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets b4ea6ad16a Few UI improvements to new sidebar implementation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 617ba01322 Fix tests for new issuable sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 6117ae98da Update changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets aa5bf4097b Make edit link on issuable sidebar works 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 76ff8eac26 Move awards css to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:09:04 +01:00
Dmitriy Zaporozhets f7bba47f8a Implement issuable sidebar partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:09:04 +01:00
Robert Speicher 6738b03902 Merge branch 'fix-typo' into 'master' 
Fix typo

[ci skip]

See merge request !2035
 2015-12-11 19:08:09 +00:00
Robert Speicher 456ddb5eb7 Fix time_ago_with_tooltip for activity feed 
Closes #4002
 2015-12-11 13:57:49 -05:00
Robert Speicher 722f14816c Update CHANGELOG 
[ci skip]
 2015-12-11 13:27:28 -05:00
Robert Speicher 2bc821301d Merge branch 'mr-statuses' into 'master' 
Display referenced merge request statuses in the issue description

See gitlab-org/gitlab-ce#3180 for original issue.
Previously discussed in !1941 and in !1771 before that.

* [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup
* [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` 
* [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding.

See merge request !1991
 2015-12-11 18:25:43 +00:00
Dmitriy Zaporozhets 29181c0420 Merge branch 'revert-2037' into 'master' 
Revert removal of RedCloth

Revert !2037.

See merge request !2071
 2015-12-11 18:18:25 +00:00
Robert Speicher 48eccdb2fc Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' 
Fix delete notes on merge request diff

Fixes #3971

See merge request !2061
 2015-12-11 12:49:55 -05:00
Drew Blessing baa97175ab Clarify cache behavior 2015-12-11 11:09:34 -06:00
Kamil Trzcinski fc1e2f8986 Run builds from projects with enabled CI 2015-12-11 18:03:48 +01:00
Kamil Trzcinski c9ac38a074 Use Gitlab::Git instead of Ci::Git 2015-12-11 18:02:32 +01:00
Kamil Trzcinski 1c0683da7b Fix last specs 2015-12-11 18:02:10 +01:00
Kamil Trzcinski dd8102f2d1 Fix specs 2015-12-11 18:02:10 +01:00
Kamil Trzcinski 513d551c8f Fix after column rename 2015-12-11 18:02:10 +01:00
Kamil Trzcinski 73b04bebad Fix errors 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 2b7a75ceaf Update badge 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 1e2a4895c8 Finishing touches 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 3578153d3e Fix triggers tests 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 91cdb08d5f Rename columns and rename migrations 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 3d9ce37a48 Reimplement Trigger API 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 64bfd9d71a Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 8cdd54cc06 Add runners token 2015-12-11 18:02:09 +01:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 8b4cdc50fc Fix indentation and BuildsEmailService 2015-12-11 18:01:57 +01:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Jacob Vosmaer d597a0a21a Pass all requests from NGINX to gitlab-workhorse 2015-12-11 16:42:40 +01:00
Douwe Maan 22999a6fa6 Revert "Merge branch 'remove-redcloth' into 'master' " 
This reverts commit e426c027b0, reversing
changes made to c3676aa156.
 2015-12-11 16:16:07 +01:00
Douwe Maan a2a68858c8 Merge branch 'feature/project_js_from_ee' into 'master' 
Aling project js with EE

The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`.  


See merge request !2054
 2015-12-11 15:13:26 +00:00
Valery Sizov eec4751bd0 Add hover-state for emoji in emoji-picker 2015-12-11 17:08:58 +02:00
Douwe Maan 50f8366a89 Merge branch 'complexity/rubocop-metrics' into 'master' 
Enable rubocop metrics

This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.

See merge request !1802
 2015-12-11 15:06:31 +00:00
Zeger-Jan van de Weg 5983e9bdf2 Minor fix in flow 'Merge when build succeeds' 
When a user, which is not the merge user, want to removes the source branch
after the automatic merge this might fail because of checks in the
DeleteBranchService
 2015-12-11 16:06:17 +01:00
Grzegorz Bizon bc1cfd384f Stub also ensure_* method in CI runners API specs 2015-12-11 15:23:43 +01:00
Grzegorz Bizon eaecd39726 Merge branch 'fix/award-emoji-alert-width' into 'master' 
Fix award-emojis alert flash message

This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996

\cc @vsizov 

See merge request !2065
 2015-12-11 13:45:38 +00:00
Grzegorz Bizon 6b0c0d5bcc Ensure that runners registration token is present 2015-12-11 14:43:44 +01:00
Grzegorz Bizon 917effb737 Make sure that token ensure_* method always returns a token 2015-12-11 14:39:51 +01:00
Grzegorz Bizon cbeb06eb42 Mix url helpers in into RepositoryPush 2015-12-11 13:00:24 +00:00
Grzegorz Bizon ef37041ab6 Update changelog 2015-12-11 13:52:23 +01:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message 
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
 2015-12-11 13:50:14 +01:00
Valery Sizov 2029be038b Merge branch 'emoji_aliases' into 'master' 
Emoji aliases problem

Fixes #3850

See merge request !2064
 2015-12-11 12:39:56 +00:00