summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Show CI status on commit pagebuild-status-on-commit-pageDmitriy Zaporozhets2015-09-243-0/+15
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show CI status on commit pageDmitriy Zaporozhets2015-09-242-0/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor ci-status badge cssDmitriy Zaporozhets2015-09-242-34/+37
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-2421-91/+151
|\
| * Merge branch 'move-ci-charts' into 'master' Dmitriy Zaporozhets2015-09-2416-69/+78
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI charts to project graphs area Part of #2594 Should be merged after !1405 Same page but moved to another place ![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png) See merge request !1407
| | * Check for CI enabled in correct placeDmitriy Zaporozhets2015-09-242-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Add header for ci graphs and check that it is enabledDmitriy Zaporozhets2015-09-242-0/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-2420-91/+160
| | |\
| | * | Update CHANGELOGmove-ci-chartsDmitriy Zaporozhets2015-09-231-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-2314-69/+69
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'rs-help-page' into 'master' Douwe Maan2015-09-243-21/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
| | * | | Allow non-admin users to see version informationrs-help-pageRobert Speicher2015-09-232-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | We want users to know what features they have available (and to pressure their admins to upgrade).
| | * | | Move the `version_check_enabled` check from view to helperRobert Speicher2015-09-233-5/+3
| | | | |
| | * | | Add a view spec (gasp!) for help/indexRobert Speicher2015-09-231-0/+55
| | | | |
| | * | | Add "Community Edition" to the version info on the help pageRobert Speicher2015-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| | * | | "fine grained" -> "fine-grained"Robert Speicher2015-09-231-1/+1
| | | | |
| | * | | Make all "Quick help" link text the entire body of the linkRobert Speicher2015-09-231-16/+5
| | | | | | | | | | | | | | | | | | | | Prior, it wasn't obvious which parts of each item was an actual link.
| | * | | Only surface version information on help index to adminsRobert Speicher2015-09-231-4/+5
| | | | | | | | | | | | | | | | | | | | Closes #2721
| * | | | Merge branch 'fix-network-graph-refs' into 'master' Douwe Maan2015-09-243-1/+21
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove git refs used internally by GitLab from network graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
| | * | | Remove git refs used internally by GitLab from network graphStan Hu2015-09-233-1/+21
| | | | | | | | | | | | | | | | | | | | Closes #2702
* | | | | Merge branch 'sshpage-fix' into 'master' Job van der Voort2015-09-242-18/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Made some steps to add SSH keys more clear See merge request !1936
| * | | | fixed step to instructionskaren Carias2015-09-231-13/+13
| | | | |
| * | | | fixed step to instructionskaren Carias2015-09-231-5/+1
| | |/ / | |/| |
* | | | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-248-219/+47
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci dashboard Part of #2594. Based on !1403 * remove rendering GitLab projects with not enabled CI on CI dashboard * remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`) * simplify the projects query for CI dashboard See merge request !1405
| * | | Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove non-existing pageDmitriy Zaporozhets2015-09-231-5/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix search for ci projects and cleanup unnecessary codeDmitriy Zaporozhets2015-09-232-13/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Simplify CI projects queryDmitriy Zaporozhets2015-09-234-50/+31
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Show only enabled CI projectsDmitriy Zaporozhets2015-09-235-109/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'pagination-last-page' into 'master' Hannes Rosenögger2015-09-237-7/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix styling conform the new styleZeger-Jan van de Weg2015-09-232-2/+3
| | | | | | | | | | | | | | | | Add my name to the right page of the changelog
| * | | Add links to first and/or last page with kaminariZeger-Jan van de Weg2015-09-236-7/+14
|/ / / | | | | | | | | | Also update Kaminari gem to the latest version
* | | Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-231-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update CHANGELOG to add unreleased 8.0.2 entry [ci skip] See merge request !1413
| * | | Update CHANGELOG to add unreleased 8.0.2 entryRobert Speicher2015-09-231-2/+9
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix-ldap-attributes' into 'master' Robert Speicher2015-09-232-7/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix LDAP attribute mapping See merge request !1408
| * | | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-232-7/+8
| | | |
* | | | Merge branch 'fix-markdown-truncation-removing-links' into 'master' Robert Speicher2015-09-233-1/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix cases where Markdown did not render links in activity feedStan Hu2015-09-223-1/+22
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'rs-sign-in-margin' into 'master' Robert Speicher2015-09-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top margin for sign-in button on public pages Closes #2615 [ci skip] See merge request !1412
| * | | | Fix top margin for sign-in button on public pagesRobert Speicher2015-09-231-1/+1
|/ / / / | | | | | | | | | | | | Closes #2615
* | | | Merge branch 'enable-ci-on-push' into 'master' Dmitriy Zaporozhets2015-09-235-1/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Refactor Project#enable_ci methodenable-ci-on-pushDmitriy Zaporozhets2015-09-231-10/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Rescue rugged error when detect ci yml fileDmitriy Zaporozhets2015-09-231-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Enable CI for gitlab when .gitlab-ci.yml is pushedDmitriy Zaporozhets2015-09-235-1/+41
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'make-commit-graphs-responsive' into 'master' Robert Speicher2015-09-232-41/+36
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Make commit graphs responsive to window width changes Closes #2653 See merge request !1395
| * | | Make commit graphs responsive to window width changesStan Hu2015-09-222-41/+36
| | | | | | | | | | | | | | | | Closes #2653
* | | | Merge branch 'ad_coder' into 'master' Dmitriy Zaporozhets2015-09-232-17/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Markdown css See merge request !1389
| * | | | Improve UI for rendered markdownad_coderAndrey2015-09-232-17/+63
| | | | |
* | | | | Merge branch 'rs-fix-help-links' into 'master' Douwe Maan2015-09-233-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent double-prefixing of help page paths Closes #2679 See merge request !1400
| * | | | | Simplify help path prefixingrs-fix-help-linksRobert Speicher2015-09-231-17/+4
| | | | | |
View Lorry Controller Status