summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-061-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add Facebook authenticationDouwe Maan2015-11-031-1/+1
|
* Merge branch 'ci-status-mr-index' into 'master' Dmitriy Zaporozhets2015-10-251-0/+9
|\ | | | | | | | | | | | | | | Ci status for merge requests index page ![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png) See merge request !1682
| * Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-231-2/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move rendering CI status to helperDmitriy Zaporozhets2015-10-231-0/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove unused argument from clipboard_button helperRobert Speicher2015-10-231-1/+1
| |
* | Add "Copy to clipboard" buttonsRobert Speicher2015-10-231-0/+8
|/ | | | | Adds buttons to the commit list SHAs and the cross-project reference data on issuables.
* Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' Dmitriy Zaporozhets2015-10-221-18/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Update style of snippets pages ![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png) ![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png) Replaces !1567. Fixes #1767 and #2538. See merge request !1637
| * Restyle dashboard snippets visibility level tabs.Douwe Maan2015-10-211-18/+0
| |
* | Animate the logo on hoverJob van der Voort2015-10-211-1/+1
|/ | | | | | The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition.
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+2
|
* Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-191-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
| * Tweak wording.Douwe Maan2015-10-181-1/+1
| |
| * Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-176-23/+52
| |\
| * | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-0/+4
| | | | | | | | | | | | | | | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
* | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-191-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to select the Files view as default project view ![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png) Also shows the readme at the very bottom, like on the regular Files page. Replaces !1489. Closes #2655. See merge request !1632
| * | | Remove redundant helper method.Douwe Maan2015-10-171-8/+2
| | | |
| * | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-1723-186/+197
| |\ \ \
| * | | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-1/+7
| | | | |
* | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-181-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| * | | | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-1/+1
| | | | |
| * | | | Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-0/+4
| | | | |
* | | | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-171-5/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
| * \ \ \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-165-5/+30
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-153-17/+17
| |\ \ \ \ \
| * | | | | | Pass project to RedactorFilterDouwe Maan2015-10-131-2/+2
| | | | | | |
| * | | | | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-071-3/+8
| | | | | | |
| * | | | | | Return strings where expectedDouwe Maan2015-10-071-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-0723-67/+381
| |\ \ \ \ \ \
| * | | | | | | Basic support for an Atom-specific rendering pipelineRobert Speicher2015-09-031-4/+6
| | | | | | | |
| * | | | | | | Return early from markdown and gfm when text is emptyRobert Speicher2015-09-031-0/+4
| | | | | | | |
| * | | | | | | Add post_process method to Gitlab::MarkdownRobert Speicher2015-09-011-2/+4
| | | | | | | |
| * | | | | | | Remove `current_user` context from markdown and gfm helpersRobert Speicher2015-09-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These helpers are no longer dependent on the current user state. Hooray!
* | | | | | | | Hide Builds tab is GitLab CI is not enabledhide-builds-tabDmitriy Zaporozhets2015-10-171-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-161-5/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| * | | | | | Allow dashboard and group issues/MRs to be filtered by labelDouwe Maan2015-10-141-5/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Make the builds view and warning notice nicerKamil Trzcinski2015-10-151-1/+1
| | | | | |
* | | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-152-4/+8
|\ \ \ \ \ \
| * | | | | | Re-use User for avatars in link_to_memberYorick Peterse2015-10-151-1/+1
| | | | | | |
| * | | | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the User object is already known before calling this method being able to re-use said object can save us an extra SQL query.
* | | | | | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-153-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| * | | | | | Added builds viewKamil Trzcinski2015-10-143-0/+21
| |/ / / / /
* | | | | | Simplify the `issues_sentence` helperrs-issues_sentenceRobert Speicher2015-10-141-1/+1
| |_|_|/ / |/| | | |
* | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-141-1/+1
| | | | |
* | | | | Show warning if build doesn't have runners with specified tags or runners ↵Kamil Trzcinski2015-10-141-15/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | didn't connect recently Slightly refactor runner status detection: moving it to Runner class Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
* | | | Restore placeholders in issue filters from "Any" to "Milestone" and "Label"Stan Hu2015-10-082-2/+4
| | | | | | | | | | | | | | | | | | | | 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
* | | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu2015-10-071-1/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
* | | 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>
View Lorry Controller Status