summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_projectRémy Coutable2016-11-244-7/+15
* API: Introduce `#find_project!` which also check access permissionRémy Coutable2016-11-242-8/+11
* API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable2016-11-242-2/+2
* Make API::Helpers find a project with only one queryRémy Coutable2016-11-242-1/+10
* Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran2016-11-235-12/+15
|\
| * timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-225-8/+12
| * move timeago.js to vendor directoryMike Greiling2016-11-222-5/+4
* | Merge branch '24851-collapsed-system-note-list-shadow-looks-weird' into 'mast...Fatih Acet2016-11-231-3/+5
|\ \
| * | fixes non-retina shadow and browser zoom issueNur Rony2016-11-231-3/+5
* | | Merge branch 'use-default-closest-if-available' into 'master' Fatih Acet2016-11-231-1/+1
|\ \ \
| * | | Use default `closest` if available!use-default-closest-if-availableLuke "Jared" Bennett2016-11-231-1/+1
* | | | Merge branch 'issue-boards-dragging-fix' into 'master' Fatih Acet2016-11-235-5/+11
|\ \ \ \
| * | | | Fixed dragging issues on issue boardsissue-boards-dragging-fixPhil Hughes2016-11-235-5/+11
| | |/ / | |/| |
* | | | Merge branch 'custom-event-polyfill' into 'master' Jacob Schatz2016-11-231-0/+12
|\ \ \ \
| * | | | Adds polyfill for CustomEventcustom-event-polyfillFilipa Lacerda2016-11-231-0/+12
| | |/ / | |/| |
* | | | Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master' Rémy Coutable2016-11-231-2/+2
|\ \ \ \
| * | | | Fix BASH usage in the .gitlab-ci.ymlzj-fix-flags-usage-gitlab-ci-ymlZ.J. van de Weg2016-11-231-2/+2
* | | | | Merge branch 'api-delete-group-share' into 'master' Rémy Coutable2016-11-234-0/+66
|\ \ \ \ \
| * | | | | API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-234-0/+66
* | | | | | Merge branch 'patch-13' into 'master' Achilleas Pipinellis2016-11-231-3/+7
|\ \ \ \ \ \
| * | | | | | add details that Git LFS must be enabled in projectBen Bodenmiller2016-11-221-3/+7
* | | | | | | Merge branch 'grapify-sidekiq-metric-api' into 'master' Rémy Coutable2016-11-231-32/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Grapify the sidekiq metrics APIRobert Schilling2016-11-231-32/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'docs/chrome-support-requirements' into 'master' Achilleas Pipinellis2016-11-231-1/+1
|\ \ \ \ \ \
| * | | | | | Add support of Chrome/Chromium in requirements.mdAchilleas Pipinellis2016-11-231-1/+1
* | | | | | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-233-1/+63
|\ \ \ \ \ \ \
| * | | | | | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-233-1/+63
* | | | | | | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-2327-101/+205
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-2327-101/+205
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-233-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | update existing testElan Ruusamäe2016-11-061-1/+1
| * | | | | | | | post_receive: accept any user email from last commitElan Ruusamäe2016-11-042-1/+5
* | | | | | | | | Merge branch 'fix/drop-project-authorized-for-user' into 'master' Sean McGivern2016-11-2314-185/+121
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-235-68/+32
| * | | | | | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-234-49/+15
| * | | | | | | | | Update user's authorized projects if project is allowed to share with groupAhmad Sherif2016-11-232-1/+11
| * | | | | | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-237-65/+61
| * | | | | | | | | Refresh user's authorized projects when one of his memberships are updatedAhmad Sherif2016-11-231-1/+1
| * | | | | | | | | Change personal projects access level to master in User#project_authorization...Ahmad Sherif2016-11-231-1/+1
| * | | | | | | | | Use the minimum access level of group link and group member when inserting au...Ahmad Sherif2016-11-231-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' Rémy Coutable2016-11-231-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable2016-11-231-2/+6
* | | | | | | | | Merge branch 'remove-empty-describe-block' into 'master' Rémy Coutable2016-11-231-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove empty describe block in service specSemyon Pupkov2016-11-221-3/+0
* | | | | | | | | | Merge branch 'zj-notify-development' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Notify broken master on #development zj-notify-developmentZeger-Jan van de Weg2016-11-181-1/+1
* | | | | | | | | | | Merge branch 'dev-issue-24554' into 'master' Sean McGivern2016-11-232-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Edit help text to clarify that tags are annotated.Liz Lam2016-11-212-1/+5
* | | | | | | | | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-234-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-234-1/+15