Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master' | Rémy Coutable | 2016-11-23 | 1 | -2/+2 |
|\ | |||||
| * | Fix BASH usage in the .gitlab-ci.ymlzj-fix-flags-usage-gitlab-ci-yml | Z.J. van de Weg | 2016-11-23 | 1 | -2/+2 |
* | | Merge branch 'api-delete-group-share' into 'master' | Rémy Coutable | 2016-11-23 | 4 | -0/+66 |
|\ \ | |||||
| * | | API: Add endpoint to delete a group shareapi-delete-group-share | Robert Schilling | 2016-11-23 | 4 | -0/+66 |
* | | | Merge branch 'patch-13' into 'master' | Achilleas Pipinellis | 2016-11-23 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | add details that Git LFS must be enabled in project | Ben Bodenmiller | 2016-11-22 | 1 | -3/+7 |
* | | | | Merge branch 'grapify-sidekiq-metric-api' into 'master' | Rémy Coutable | 2016-11-23 | 1 | -32/+4 |
|\ \ \ \ | |||||
| * | | | | Grapify the sidekiq metrics API | Robert Schilling | 2016-11-23 | 1 | -32/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'docs/chrome-support-requirements' into 'master' | Achilleas Pipinellis | 2016-11-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Add support of Chrome/Chromium in requirements.md | Achilleas Pipinellis | 2016-11-23 | 1 | -1/+1 |
* | | | | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' | Sean McGivern | 2016-11-23 | 3 | -1/+63 |
|\ \ \ \ \ | |||||
| * | | | | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeable | Douwe Maan | 2016-11-23 | 3 | -1/+63 |
* | | | | | | Merge branch 'milestone_start_date' into 'master' | Sean McGivern | 2016-11-23 | 27 | -101/+205 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a starting date to milestonesmilestone_start_date | Valery Sizov | 2016-11-23 | 27 | -101/+205 |
* | | | | | | | Merge branch 'post_receive-any-email' into 'master' | Sean McGivern | 2016-11-23 | 3 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | update existing test | Elan Ruusamäe | 2016-11-06 | 1 | -1/+1 |
| * | | | | | | | post_receive: accept any user email from last commit | Elan Ruusamäe | 2016-11-04 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'fix/drop-project-authorized-for-user' into 'master' | Sean McGivern | 2016-11-23 | 14 | -185/+121 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-user | Ahmad Sherif | 2016-11-23 | 5 | -68/+32 |
| * | | | | | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizations | Ahmad Sherif | 2016-11-23 | 4 | -49/+15 |
| * | | | | | | | | Update user's authorized projects if project is allowed to share with group | Ahmad Sherif | 2016-11-23 | 2 | -1/+11 |
| * | | | | | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member? | Ahmad Sherif | 2016-11-23 | 7 | -65/+61 |
| * | | | | | | | | Refresh user's authorized projects when one of his memberships are updated | Ahmad Sherif | 2016-11-23 | 1 | -1/+1 |
| * | | | | | | | | Change personal projects access level to master in User#project_authorization... | Ahmad Sherif | 2016-11-23 | 1 | -1/+1 |
| * | | | | | | | | Use the minimum access level of group link and group member when inserting au... | Ahmad Sherif | 2016-11-23 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' | Rémy Coutable | 2016-11-23 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Ensure we sanitize branch names with path-unfriendly characters | Rémy Coutable | 2016-11-23 | 1 | -2/+6 |
* | | | | | | | | Merge branch 'remove-empty-describe-block' into 'master' | Rémy Coutable | 2016-11-23 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove empty describe block in service spec | Semyon Pupkov | 2016-11-22 | 1 | -3/+0 |
* | | | | | | | | | Merge branch 'zj-notify-development' into 'master' | Sean McGivern | 2016-11-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Notify broken master on #development zj-notify-development | Zeger-Jan van de Weg | 2016-11-18 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'dev-issue-24554' into 'master' | Sean McGivern | 2016-11-23 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Edit help text to clarify that tags are annotated. | Liz Lam | 2016-11-21 | 2 | -1/+5 |
* | | | | | | | | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' | Douwe Maan | 2016-11-23 | 4 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issue | James Lopez | 2016-11-23 | 4 | -1/+15 |
* | | | | | | | | | | | | Merge branch 'status-badge-spacing' into 'master' | Fatih Acet | 2016-11-23 | 3 | -18/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix spacing between icon and word in status badgestatus-badge-spacing | Annabel Dunstone Gray | 2016-11-22 | 3 | -18/+10 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'eslint-html-report' into 'master' | Robert Speicher | 2016-11-23 | 3 | -3/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Generate ESLint HTML report (!7374) | winniehell | 2016-11-22 | 3 | -3/+24 |
* | | | | | | | | | | | Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' | Robert Speicher | 2016-11-23 | 3 | -7/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix sidekiq stats in admin area | blackst0ne | 2016-11-23 | 3 | -7/+30 |
* | | | | | | | | | | | | Merge branch '24756-clean-up-eslintrc-globals' into 'master' | Alfredo Sumaran | 2016-11-23 | 18 | -30/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | keep json alphabetized24756-clean-up-eslintrc-globals | Mike Greiling | 2016-11-22 | 1 | -6/+6 |
| * | | | | | | | | | | | | add "gon" to list of expected globals | Mike Greiling | 2016-11-22 | 1 | -0/+1 |
| * | | | | | | | | | | | | clean up globals exemptions within .eslintrc | Mike Greiling | 2016-11-22 | 18 | -25/+47 |
* | | | | | | | | | | | | | Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen... | Fatih Acet | 2016-11-22 | 4 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Use btn-primary for running builds btn | Annabel Dunstone Gray | 2016-11-22 | 1 | -3/+3 |
| * | | | | | | | | | | | | deleted old changelog entry24266-afraid-to-press-the-orange-button-on-merge-request-screen | Dimitrie Hoekstra | 2016-11-22 | 1 | -4/+0 |
| * | | | | | | | | | | | | added proper changelog entry | Dimitrie Hoekstra | 2016-11-22 | 1 | -0/+4 |
| * | | | | | | | | | | | | If Build running change accept merge request when build succeeds button from ... | Dimitrie Hoekstra | 2016-11-18 | 3 | -2/+6 |