Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly find last known blob for file deleted in MR.merge-request-deleted-file | Douwe Maan | 2015-10-20 | 1 | -1/+2 |
| | |||||
* | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵ | Douwe Maan | 2015-10-19 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings   Replaces !1579. Fixes #2578. See merge request !1636 | ||||
| * | Tweak wording. | Douwe Maan | 2015-10-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into remove-forks-from-projects-settings | Han Loong Liauw | 2015-10-17 | 6 | -23/+52 |
| |\ | |||||
| * | | Adds ability to remove the forked relationship | Han Loong Liauw | 2015-10-13 | 1 | -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 Zaporozhets | 2015-10-19 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to select the Files view as default project view  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 Maan | 2015-10-17 | 1 | -8/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files | Douwe Maan | 2015-10-17 | 23 | -186/+197 |
| |\ \ \ | |||||
| * | | | | Allow users to select the Files view as default project view | Cristian Bica | 2015-10-01 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' | Douwe Maan | 2015-10-18 | 1 | -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.  /cc @DouweM See merge request !1569 | ||||
| * | | | | Only accept open issues and merge requests | Zeger-Jan van de Weg | 2015-10-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Show merge requests which close current issue | Zeger-Jan van de Weg | 2015-10-16 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'rs-redactor-filter' into 'master' | Douwe Maan | 2015-10-17 | 1 | -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-filter | Douwe Maan | 2015-10-16 | 5 | -5/+30 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-15 | 3 | -17/+17 |
| |\ \ \ \ \ | |||||
| * | | | | | | Pass project to RedactorFilter | Douwe Maan | 2015-10-13 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Refactor reference gathering to use a dedicated filter | Douwe Maan | 2015-10-07 | 1 | -3/+8 |
| | | | | | | | |||||
| * | | | | | | Return strings where expected | Douwe Maan | 2015-10-07 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-07 | 23 | -67/+381 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Basic support for an Atom-specific rendering pipeline | Robert Speicher | 2015-09-03 | 1 | -4/+6 |
| | | | | | | | | |||||
| * | | | | | | | Return early from markdown and gfm when text is empty | Robert Speicher | 2015-09-03 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Add post_process method to Gitlab::Markdown | Robert Speicher | 2015-09-01 | 1 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | Remove `current_user` context from markdown and gfm helpers | Robert Speicher | 2015-09-01 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These helpers are no longer dependent on the current user state. Hooray! | ||||
* | | | | | | | | Hide Builds tab is GitLab CI is not enabledhide-builds-tab | Dmitriy Zaporozhets | 2015-10-17 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'filter-label' into 'master' | Robert Speicher | 2015-10-16 | 1 | -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 label | Douwe Maan | 2015-10-14 | 1 | -5/+13 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Make the builds view and warning notice nicer | Kamil Trzcinski | 2015-10-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'view-issue-performance' | Dmitriy Zaporozhets | 2015-10-15 | 2 | -4/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Re-use User for avatars in link_to_member | Yorick Peterse | 2015-10-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Allow avatar_icon to operate on a User | Yorick Peterse | 2015-10-15 | 1 | -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ński | 2015-10-15 | 3 | -0/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view  /cc @dzaporozhets @vsizov See merge request !1593 | ||||
| * | | | | | | Added builds view | Kamil Trzcinski | 2015-10-14 | 3 | -0/+21 |
| |/ / / / / | |||||
* | | | | | | Simplify the `issues_sentence` helperrs-issues_sentence | Robert Speicher | 2015-10-14 | 1 | -1/+1 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Fix warning signshow_pending_warning | Kamil Trzcinski | 2015-10-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Show warning if build doesn't have runners with specified tags or runners ↵ | Kamil Trzcinski | 2015-10-14 | 1 | -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 Hu | 2015-10-08 | 2 | -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 Hu | 2015-10-07 | 1 | -1/+3 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631 | ||||
* | | | Fix ci build routing and few testsci-build-page | Dmitriy Zaporozhets | 2015-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Cleanup CI code after refactoring and fix several 500 errors | Dmitriy Zaporozhets | 2015-10-06 | 2 | -24/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Link ci_status_path to new ci commit pageci-commit-page | Dmitriy Zaporozhets | 2015-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'user-preferences-layout-option' of ↵ | Dmitriy Zaporozhets | 2015-10-05 | 2 | -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 naming | Peter Göbel | 2015-10-05 | 2 | -3/+3 |
| | | | | |||||
| * | | | added user preference to change layout width | Peter Göbel | 2015-10-05 | 2 | -1/+8 |
| | | | | |||||
* | | | | Fix next round of tests | Kamil Trzcinski | 2015-10-05 | 1 | -4/+0 |
| | | | | |||||
* | | | | Refactor commit and build | Kamil Trzcinski | 2015-10-05 | 3 | -3/+3 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Guilherme Garnier | 2015-10-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update README cache key to use full project namespace | Stan Hu | 2015-10-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix rubocop warnings in app | Guilherme Garnier | 2015-10-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #9684 from NKMR6194/master | Stan Hu | 2015-10-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix link with emoji | ||||
| * | | | Fix link with emoji | SAKATA Sinji | 2015-10-02 | 1 | -1/+1 |
| | | | |