summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-061-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-062-24/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Link ci_status_path to new ci commit pageci-commit-pageDmitriy Zaporozhets2015-10-061-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-052-1/+8
|\ | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * improved code style and layout option namingPeter Göbel2015-10-052-3/+3
| |
| * added user preference to change layout widthPeter Göbel2015-10-052-1/+8
| |
* | Fix next round of testsKamil Trzcinski2015-10-051-4/+0
| |
* | Refactor commit and buildKamil Trzcinski2015-10-053-3/+3
|/
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-031-1/+1
|\
| * Update README cache key to use full project namespaceStan Hu2015-10-021-1/+1
| |
* | Fix rubocop warnings in appGuilherme Garnier2015-10-031-1/+1
|/
* Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-1/+1
|\ | | | | Fix link with emoji
| * Fix link with emojiSAKATA Sinji2015-10-021-1/+1
| |
* | Fix 500 error on compare pagefix-500-compareDmitriy Zaporozhets2015-10-011-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-301-0/+13
|/ | | | | | Previous title would only show the group name, which could be confusing. Closes #2875
* Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-301-0/+19
|\ | | | | | | | | | | | | | | | | | | | | Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471
| * Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-301-0/+19
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Refactor CI helpersDmitriy Zaporozhets2015-09-2911-141/+92
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'krb_auth_helper_ce' into 'master' Douwe Maan2015-09-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Remove 'kerberos' from auth_helper.rb for gitlab-CE. There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510). @DouweM suggested I send in this merge request. See merge request !1430
| * Remove 'kerberos' from auth_helper.rb for gitlab-CE.Ben Rosser2015-09-241-1/+1
| | | | | | | | | | | | | | There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510
* | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-0/+8
|\ \
| * | Move runners page to project settingsDmitriy Zaporozhets2015-09-251-0/+8
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-1/+3
|/ | | | | | default dashboard Closes #2662
* Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-241-29/+0
|\ | | | | | | | | | | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
| * Fix Slack notification URL and remove the usage of Ci::RoutesHelperKamil Trzcinski2015-09-221-29/+0
| |
* | Merge branch 'rs-help-page' into 'master' Douwe Maan2015-09-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Move the `version_check_enabled` check from view to helperRobert Speicher2015-09-231-1/+1
| | |
* | | Merge branch 'fix-network-graph-refs' into 'master' Douwe Maan2015-09-241-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+4
| |/ | | | | | | Closes #2702
* | Merge branch 'fix-markdown-truncation-removing-links' into 'master' Robert Speicher2015-09-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-1/+1
| |/ | | | | | | | | | | | | | | | | 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
* | Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-232-1/+35
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Link project repo size to filesrepo-size-linkDouwe Maan2015-09-211-2/+2
|
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
| * Minor code cleanupnotification-levelsDouwe Maan2015-09-201-9/+6
| |
| * Merge branch 'master' into notification-levelsPatricio Cano2015-09-1613-3/+379
| |\
| * \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-164-18/+85
| |\ \
| * | | Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano2015-09-161-7/+15
| | | | | | | | | | | | | | | | the current level instead of `Notifications`
| * | | Notification dropdown now shows currently active level, and also shows what ↵Patricio Cano2015-09-141-5/+14
| | | | | | | | | | | | | | | | the actual value of `global` is, if the project has the notification level set to global.
| * | | Corrected `case` indentation to conform with RubocopPatricio Cano2015-09-141-22/+22
| | | |
| * | | Added spacing to icons in Notification drop downPatricio Cano2015-09-141-4/+4
| | | |
| * | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-8/+12
| | | |
| * | | Fixed notification level list item helper.Patricio Cano2015-09-141-12/+8
| | | |
| * | | PAtrially working notification buttonDarby2015-09-141-0/+31
| | | |
* | | | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Markdown links not showing up in dashboard activity feed Closes #2586 See merge request !1353
| * | | | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #2586
* | | | | Cleanup GitLab CI UIci-build-listDmitriy Zaporozhets2015-09-193-37/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-182-40/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' into project-header-titlesDouwe Maan2015-09-182-109/+3
| |\ \ \ \
View Lorry Controller Status