summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update gitignores and licenses - generated by bin/rake gitlab:update_templatesupdate-gitignore-9-5Simon Knox2017-08-0911-48/+58
* Merge branch 'ask-for-exceptions-in-advance' into 'master'Rémy Coutable2017-08-091-10/+27
|\
| * Translations can be picked without asking for exceptionsSean McGivern2017-08-091-5/+12
| * Ask for exceptions in advanceSean McGivern2017-08-091-5/+15
* | Merge branch 'rc/cob-do-not-require-stackprof' into 'master'Sean McGivern2017-08-092-2/+3
|\ \
| * | Don't require stackprof in GemfileRémy Coutable2017-08-092-2/+3
| |/
* | Merge branch 'update-source-install-docs-with-i18n' into 'master'Rémy Coutable2017-08-095-9/+37
|\ \ | |/ |/|
| * Update docs with i18n info for source installationsupdate-source-install-docs-with-i18nRubén Dávila2017-08-085-9/+37
* | Merge branch '34339-user_avatar-url-in-push-event-webhook-json-payload-is-rel...Rémy Coutable2017-08-092-1/+5
|\ \
| * | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-092-1/+5
* | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master'Rémy Coutable2017-08-091-8/+11
|\ \ \
| * | | Synchronous Korean translation in zanata黄涛2017-08-091-8/+11
| |/ /
* | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2017-08-091-1/+1
|\ \ \
| * | | Update README.md with a more flexible sentencePaolo Falomo2017-08-071-1/+1
| * | | there are 3 dots but it says four products. fixed Paolo Falomo2017-07-271-1/+1
* | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master'Achilleas Pipinellis2017-08-091-7/+7
|\ \ \ \
| * | | | Remove trailing comma in System Hooks payload examplesMark Fletcher2017-08-081-7/+7
* | | | | Merge branch 'sh-structured-log-docs' into 'master'Achilleas Pipinellis2017-08-091-0/+27
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add docs on structured logging in GitLabsh-structured-log-docsStan Hu2017-08-081-0/+27
* | | | | Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-081-0/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
|/ / / /
* | | | Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
* | | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0834-48/+90
|\ \ \ \
| * | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
* | | | | Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray2017-08-083-9/+78
|\ \ \ \ \
| * | | | | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-083-9/+78
|/ / / / /
* | | | | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\ \ \ \ \
| * | | | | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
| |/ / / /
* | | | | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \ \ \ \
| * | | | | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| * | | | | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| * | | | | Revert "Combine 'turn on/off' user dropdown links into 'experimental features...Mike Greiling2017-08-085-5/+7
* | | | | | Merge branch '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \ \ \ \ \
| * | | | | | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
* | | | | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-082-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-082-2/+2
* | | | | | | | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-085-8/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-085-8/+29
* | | | | | | | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-087-4/+84
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-087-4/+84
* | | | | | | | | Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix fly-out width when it has long itemsfly-out-min-widthPhil Hughes2017-08-081-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0820-158/+180
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-079-26/+76
| * | | | | | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-077-53/+46
| * | | | | | | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-0715-85/+64
* | | | | | | | | Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray2017-08-082-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed modals being below navbarheader-z-index-fixPhil Hughes2017-08-072-1/+3
* | | | | | | | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-085-1/+102
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
View Lorry Controller Status