Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix active nav badges not inheriting the link color.fix-active-nav-badges | Pedro Moreira da Silva | 2016-12-06 | 1 | -0/+4 |
| | |||||
* | Merge branch 'deleted-source-branch-comment' into 'master' | Sean McGivern | 2016-12-06 | 1 | -0/+3 |
|\ | | | | | | | | | Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949 | ||||
| * | Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip] | Adam Niedzielski | 2016-12-06 | 1 | -0/+3 |
| | | |||||
* | | Merge branch '23589-open-issue-for-mr' into 'master' | Sean McGivern | 2016-12-06 | 28 | -22/+670 |
|\ \ | | | | | | | | | | | | | Create an issue for all unresolved discussions in an MR See merge request !7180 | ||||
| * | | Feature: delegate all open discussions to Issue | Bob Van Landuyt | 2016-12-05 | 28 | -22/+670 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue. | ||||
* | | | Merge branch '24733-archived-project-merge-request-count' into 'master' | Sean McGivern | 2016-12-06 | 8 | -9/+62 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790 | ||||
| * | | | Fix Archived project merge requests add to group's Merge Requests | Jacopo | 2016-12-05 | 8 | -9/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml | ||||
* | | | | Merge branch 'zj-guest-reads-public-builds' into 'master' | Sean McGivern | 2016-12-06 | 11 | -12/+95 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Guests can read builds if those are public See merge request !6842 | ||||
| * | | | Update effected testszj-guest-reads-public-builds | Z.J. van de Weg | 2016-12-04 | 7 | -47/+45 |
| | | | | |||||
| * | | | Guests can read builds if those are public | Z.J. van de Weg | 2016-12-04 | 7 | -10/+95 |
| | | | | | | | | | | | | | | | | Fixes #18448 | ||||
* | | | | Merge branch 'refine-ci-statuses' into 'master' | Kamil Trzciński | 2016-12-06 | 29 | -7/+698 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889 | ||||
| * | | | | Add text example for pipeline status without actionrefine-ci-statuses | Grzegorz Bizon | 2016-12-06 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Use detailed status as CSS class in pipelines list | Grzegorz Bizon | 2016-12-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use status text when redering pipelines list | Grzegorz Bizon | 2016-12-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Improve support for icons in new detailed statuses | Grzegorz Bizon | 2016-12-06 | 3 | -2/+5 |
| | | | | | |||||
| * | | | | Add status label information to pipeline header | Grzegorz Bizon | 2016-12-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Untangle status label and text in ci status helper | Grzegorz Bizon | 2016-12-06 | 2 | -2/+21 |
| | | | | | |||||
| * | | | | Simplify ci status helper with detailed status | Grzegorz Bizon | 2016-12-06 | 1 | -22/+22 |
| | | | | | |||||
| * | | | | Remove unsued variable from merge request widget | Grzegorz Bizon | 2016-12-06 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Restore legacy statuses support in ci status helpers | Grzegorz Bizon | 2016-12-06 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add support for detailed status to status helpers | Grzegorz Bizon | 2016-12-05 | 3 | -24/+36 |
| | | | | | |||||
| * | | | | Expose pipeline detailed status using status factory | Grzegorz Bizon | 2016-12-05 | 2 | -0/+74 |
| | | | | | |||||
| * | | | | Extend tests for pipeline status factory | Grzegorz Bizon | 2016-12-05 | 1 | -3/+16 |
| | | | | | |||||
| * | | | | Implement pipeline status factory with extended status | Grzegorz Bizon | 2016-12-05 | 2 | -0/+76 |
| | | | | | |||||
| * | | | | Fold core/extended status modules to reduce nesting | Grzegorz Bizon | 2016-12-05 | 23 | -60/+54 |
| | | | | | |||||
| * | | | | Implement extended pipeline - status with warnings | Grzegorz Bizon | 2016-12-02 | 2 | -0/+77 |
| | | | | | |||||
| * | | | | Add implementation of common pipeline extended status | Grzegorz Bizon | 2016-12-02 | 3 | -4/+28 |
| | | | | | |||||
| * | | | | Add information about badge test to core statuses | Grzegorz Bizon | 2016-12-02 | 15 | -0/+60 |
| | | | | | |||||
| * | | | | Add scaffold for remaining statuses-related classes | Grzegorz Bizon | 2016-12-02 | 8 | -0/+64 |
| | | | | | |||||
| * | | | | Implement the rest of core CI statuses with specs | Grzegorz Bizon | 2016-12-02 | 15 | -8/+160 |
| | | | | | |||||
| * | | | | Add abstract base class for core CI status | Grzegorz Bizon | 2016-12-02 | 3 | -1/+44 |
| | | | | | |||||
| * | | | | Add initial implmentation for core success status | Grzegorz Bizon | 2016-12-02 | 2 | -0/+18 |
| | | | | | |||||
| * | | | | Add scaffold for each class of core CI status | Grzegorz Bizon | 2016-12-02 | 7 | -0/+56 |
| | | | | | |||||
* | | | | | Merge branch 'rs-extended-regexp' into 'master' | Rémy Coutable | 2016-12-06 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `--extended-regexp` in lint-doc for compatibility with Darwin grep Now it should work on all platforms. See merge request !7943 | ||||
| * | | | | | Use `--extended-regexp` in lint-doc for compatibility with Darwin greprs-extended-regexp | Robert Speicher | 2016-12-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'glm-shorthand-reference' into 'master' | Sean McGivern | 2016-12-06 | 41 | -286/+1022 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255 | ||||
| * | | | | | | Update user markdown docs with cross-project shorthand version | Oswaldo Ferreira | 2016-12-02 | 1 | -0/+12 |
| | | | | | | | |||||
| * | | | | | | Add shorthand support to gitlab markdown references | Oswaldo Ferreira | 2016-12-02 | 40 | -286/+1010 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/authorize-users-into-imported-gitlab-project' into 'master' | Sean McGivern | 2016-12-06 | 3 | -2/+14 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Authorize users into imported GitLab project https://gitlab.com/gitlab-com/support-forum/issues/1313 See merge request !7936 | ||||
| * | | | | | | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-project | Ahmad Sherif | 2016-12-05 | 3 | -2/+14 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' | Jacob Schatz | 2016-12-06 | 2 | -0/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900 | ||||
| * | | | | | | Fixed MR widget content wrapping for XS viewports | Ryan Harris | 2016-12-05 | 2 | -0/+10 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button | ||||
* | | | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-12-06 | 5 | -16/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update CHANGELOG.md for 8.13.8 | Alejandro Rodríguez | 2016-12-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | Update CHANGELOG.md for 8.14.3 | Alejandro Rodríguez | 2016-12-02 | 5 | -16/+9 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | Merge branch 'issue_25064' into 'security' | Douwe Maan | 2016-12-06 | 3 | -6/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure state param has a valid value when filtering issuables. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25064 This fix makes sure we only call safe methods on issuable when filtering by state. See merge request !2038 | ||||
* | | | | | | | Merge branch 'document-public-project-api' into 'master' | Douwe Maan | 2016-12-06 | 1 | -4/+44 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the public Project API and document `GET /projects/:id/users` Documentation was not updated in !7843. Also the `GET /projects/:id/users` endpoint was not documented at all! See merge request !7897 | ||||
| * | | | | | | | Document the public Project API and document `GET /projects/:id/users`document-public-project-api | Rémy Coutable | 2016-12-02 | 1 | -4/+44 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch 'remove-errors-scss' into 'master' | Jacob Schatz | 2016-12-05 | 1 | -16/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused errors css `.error-page` isn't being used anywhere as far as I can see so I removed it See merge request !7933 | ||||
| * | | | | | | | Remove unused errors cssremove-errors-scss | Annabel Dunstone Gray | 2016-12-05 | 1 | -16/+0 |
| | | | | | | | |