home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +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
Robert Speicher 6e65108325 Add Troubleshooting section to 7.14 to 8.0 Update guide 2015-09-23 20:36:25 -04:00
Robert Speicher e8ce9639da Add Troubleshooting section to Install guide 2015-09-23 20:36:17 -04:00
Hannes Rosenögger 68cb24c439 Merge branch 'pagination-last-page' into 'master' 
Pagination last page

First commit adds a link to the last page.![Screenshot_from_2015-09-17_20-29-00](https://gitlab.com/zj/gitlab-ce/uploads/dcd4f97b8b75c6725ed2a71ba86057b4/Screenshot_from_2015-09-17_20-29-00.png)

Unless there are less than 5 pages to show.![Screenshot_from_2015-09-17_20-34-31](https://gitlab.com/zj/gitlab-ce/uploads/2d730ad11306abcfa83c69627d4f6a7d/Screenshot_from_2015-09-17_20-34-31.png)

Also updates the `Kaminari` gem to the latest version, which is a minor update. [Changelog](https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc)


See merge request !1334
 2015-09-23 22:38:39 +00:00
Robert Speicher 45824aabc6 Allow non-admin users to see version information 
We want users to know what features they have available (and to pressure
their admins to upgrade).
 2015-09-23 17:18:15 -04:00
karen Carias cfcb5f0f6a fixed step to instructions 2015-09-23 13:43:57 -07:00
karen Carias 84d450bf4d fixed step to instructions 2015-09-23 13:33:58 -07:00
Robert Speicher be142e6bd6 Move the version_check_enabled check from view to helper 2015-09-23 16:28:51 -04:00
Robert Speicher 48cfad9013 Add a view spec (gasp!) for help/index 2015-09-23 16:20:58 -04:00
Zeger-Jan van de Weg fe6ea91107 Fix styling conform the new style 
Add my name to the right page of the changelog
 2015-09-23 22:16:59 +02:00
Zeger-Jan van de Weg 3d177a818f Add links to first and/or last page with kaminari 
Also update Kaminari gem to the latest version
 2015-09-23 22:15:16 +02:00
Stan Hu b41274c172 Use standard Markdown font in Markdown preview instead of fixed-width font 
Closes #2585
 2015-09-23 13:13:08 -07:00
Robert Speicher 73288a8edb Add "Community Edition" to the version info on the help page 
If the version information was hidden because the user was not an admin,
the "GitLab" text looked lonely. This also brings us more in line with
EE which shows "Enterprise Edition".
 2015-09-23 16:03:52 -04:00
Robert Speicher de844ebf6c "fine grained" -> "fine-grained" 2015-09-23 16:03:38 -04:00
Robert Speicher 316358345a Make all "Quick help" link text the entire body of the link 
Prior, it wasn't obvious which parts of each item was an actual link.
 2015-09-23 16:02:21 -04:00
Robert Speicher ebcd503e93 Only surface version information on help index to admins 
Closes #2721
 2015-09-23 16:01:35 -04:00
Robert Speicher fd6b5099fb Merge branch 'rs-changelog' into 'master' 
Update CHANGELOG to add unreleased 8.0.2 entry

[ci skip]

See merge request !1413
 2015-09-23 18:06:47 +00:00
Robert Speicher be696b72eb Update CHANGELOG to add unreleased 8.0.2 entry 
[ci skip]
 2015-09-23 13:39:58 -04:00
Robert Speicher 7bca8745fd Merge branch 'fix-ldap-attributes' into 'master' 
Fix LDAP attribute mapping

See merge request !1408
 2015-09-23 17:29:25 +00:00
Robert Speicher 0175769aa8 Merge branch 'fix-markdown-truncation-removing-links' into 'master' 
Fix cases where Markdown did not render links in activity feed

HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586

See merge request !1401
 2015-09-23 17:20:37 +00:00
Robert Speicher 3f2c0e94df Merge branch 'rs-sign-in-margin' into 'master' 
Fix top margin for sign-in button on public pages

Closes #2615

[ci skip]

See merge request !1412
 2015-09-23 17:00:19 +00:00
Robert Speicher 15bf2e4457 Fix top margin for sign-in button on public pages 
Closes #2615
 2015-09-23 12:58:00 -04:00
Dmitriy Zaporozhets b859506b03 Merge branch 'enable-ci-on-push' into 'master' 
Enable CI for gitlab when .gitlab-ci.yml is pushed 

Make enabling CI as easy as pushing file. 

Should be merged after !1402. 

Fixes #2650. Part of #2594 and internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2528

See merge request !1403
 2015-09-23 16:36:49 +00:00
Chia Yu Pai b57bc0389e Update 7.14-to-8.0.md 
Add missing path change back
 2015-09-24 00:35:22 +08:00
Robert Speicher 32cb9d215d Merge branch 'make-commit-graphs-responsive' into 'master' 
Make commit graphs responsive to window width changes

Closes #2653

See merge request !1395
 2015-09-23 16:31:32 +00:00
Stan Hu 150fb81ef9 Remove git refs used internally by GitLab from network graph 
Closes #2702
 2015-09-23 08:56:32 -07:00
Dmitriy Zaporozhets 0a57c3f610 Refactor Project#enable_ci method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:52:26 +02:00
Douwe Maan 73a3df4de3 Fix LDAP attribute mapping 2015-09-23 16:37:59 +02:00
Dmitriy Zaporozhets d538955ac8 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:24:46 +02:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:24:46 +02:00
Dmitriy Zaporozhets 4bc1e040d4 Remove test for non existing functionality 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:20:48 +02:00
Dmitriy Zaporozhets 368a40fce6 Remove non-existing page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:35:43 +02:00
Dmitriy Zaporozhets c3f63d6f77 Fix search for ci projects and cleanup unnecessary code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:33:36 +02:00
Dmitriy Zaporozhets 31b15e3dce Simplify CI projects query 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:30:24 +02:00
Dmitriy Zaporozhets 0731a7af31 Show only enabled CI projects 
Since CI is enabled by pushing .gitlab-ci.yml file there is no need to
add CI project via dashboard

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:00:05 +02:00
Dmitriy Zaporozhets aba9668ace Rescue rugged error when detect ci yml file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 14:29:41 +02:00
Dmitriy Zaporozhets cfe6634078 Merge branch 'ad_coder' into 'master' 
Improve Markdown css



See merge request !1389
 2015-09-23 12:22:45 +00:00
Douwe Maan ff63a166e9 Merge branch 'rs-fix-help-links' into 'master' 
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
 2015-09-23 11:44:17 +00:00
Douwe Maan e63b64de34 Merge branch 'commits-page-ci-status' into 'master' 
Commits page CI status

Show CI status for each commit row on pages like: Commits, Merge request (commits tab), Compare etc

![Screenshot_2015-09-23_12.34.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d40d6a69f76128e32d3a0cb641b3495b/Screenshot_2015-09-23_12.34.50.png)


Fixes #2632 

See merge request !1402
 2015-09-23 11:41:24 +00:00
Dmitriy Zaporozhets 2eb9a20f36 Enable CI for gitlab when .gitlab-ci.yml is pushed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 13:11:40 +02:00
Hannes Rosenögger 486a647925 Merge branch 'correct-markdown-documentation' into 'master' 
Correct markdown.md docs RE use in commit messages.

This is an improvement to the situation covered in issue #1582. It corrects the markdown documentation to demonstrate that GFM cannot currently be used in commit messages.

See merge request !1343
 2015-09-23 10:35:48 +00:00
Dmitriy Zaporozhets 3b6915d891 Add tests for CiStatusHelper and changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:34:21 +02:00
Dmitriy Zaporozhets 21dfaa000d Show CI status on all pages where commits list is rendered 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:23:04 +02:00
Dmitriy Zaporozhets 64ec7a3e0e Bump version and changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:21:22 +02:00
Marin Jankovski 241ec7a5ee Merge branch 'fix-mr-missing-source-branch-error' into 'master' 
Fix error when MR source branch no longer exists.



See merge request !1393
 2015-09-23 09:28:59 +00:00
Douwe Maan b4bedfdfb9 Merge branch 'fix-user-identities-api' into 'master' 
Fix user identities API

Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't.

@DouweM or @stanhu could you please take a look at my code, and see if its sound?

/cc @JobV 

See merge request !1398
 2015-09-23 09:13:23 +00:00
AndreyandDmitriy Zaporozhets 9103602620 Improve UI for rendered markdown 2015-09-23 10:58:28 +02:00
Stan Hu a7b0ee3fd1 Fix cases where Markdown did not render links in activity feed 
HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586
 2015-09-22 21:56:27 -07:00
Robert Speicher 95f73a68fa Simplify help path prefixing 2015-09-23 00:24:17 -04:00
Robert Speicher 64e0dfa530 Prevent double-prefixing of help page paths 
Prior, because the link "api/README.md" was matched twice, the first
link became "help/help/api/README.md". Now we do a negative lookahead to
make sure the link doesn't start with `help/`.

This fix is still not ideal, see TODO note.
 2015-09-22 18:26:51 -04:00
Robert Speicher c551c81e28 Fix "User permissions" help page path 2015-09-22 18:26:41 -04:00