summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-0/+2
|
* Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-191-0/+25
|\ | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| * added spinach testsValery Sizov2015-11-191-1/+5
| |
| * addressing commentsValery Sizov2015-11-191-0/+4
| |
| * Emoji: fix image of emoji when it is submitted via commentValery Sizov2015-11-191-1/+1
| |
| * Emoji: refactoringValery Sizov2015-11-191-0/+4
| |
| * add stats on hoverValery Sizov2015-11-191-0/+8
| |
| * award emojiValery Sizov2015-11-191-0/+5
| |
* | Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master' Robert Speicher2015-11-191-8/+0
|\ \ | |/ |/| | | | | | | | | | | | | Add option to create merge request when editing/creating a file Replaces !1611 Fixes #3059 See merge request !1820
| * Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-184-56/+59
| |\
| * | Add "Start a new merge request" option to every commit formDouwe Maan2015-11-171-0/+20
| | |
| * | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-1717-111/+98
| |\ \
| * | | Add option to create merge request when editing/creating a fileDirceu Pereira Tiegs2015-10-191-28/+0
| | | |
* | | | Add Project#safe_import_url helper.Douwe Maan2015-11-181-8/+0
| |_|/ |/| |
* | | Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814
| * | | Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-171-1/+1
| | | |
* | | | Merge branch 'remove-code-duplication'Dmitriy Zaporozhets2015-11-174-55/+54
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor duplciate code for groups_controller.rb and ↵Dmitriy Zaporozhets2015-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove duplication in diff_helper.rbDmitriy Zaporozhets2015-11-171-16/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove code duplication in gitlab_markdown_helper.rbDmitriy Zaporozhets2015-11-171-28/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor select2 tagsDmitriy Zaporozhets2015-11-162-11/+14
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Don't use params[:view] directly.param-viewDouwe Maan2015-11-171-2/+6
|/ / /
* | | Refactor global and group milestones logicDmitriy Zaporozhets2015-11-162-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix wrong variable namerefactor-duplicationDmitriy Zaporozhets2015-11-161-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix code duplication in NotificationsHelperDmitriy Zaporozhets2015-11-161-25/+13
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'builds_feature' into 'master' Kamil Trzciński2015-11-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose builds feature Expose builds feature in project settings (as feature). Enable it by default for a new projects. I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it. ![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png) If we are ok, I'll add feature tests for it. /cc @sytses @dzaporozhets See merge request !1767
| * | | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-1/+1
| | | | | | | | | | | | | | | | - Enable CI by default for all new projects
* | | | Split complex method EventsHelper#event_feed_url.Dmitriy Zaporozhets2015-11-131-11/+15
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix avatars not showing in Atom feeds and project issues when Gravatar disabledStan Hu2015-11-102-2/+2
|/ / | | | | | | Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
* | Merge branch 'small-ui-improvements' into 'master' Dmitriy Zaporozhets2015-11-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small UI improvements to merge request page Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes internal issues * https://dev.gitlab.org/gitlab/gitlabhq/issues/2591 * https://dev.gitlab.org/gitlab/gitlabhq/issues/2592 cc @DouweM See merge request !1759
| * | Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-061-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | CI details cleanupKamil Trzcinski2015-11-053-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* | | Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-051-1/+1
|/ /
* | 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
| |\ \ \ \