Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'ask-for-exceptions-in-advance' into 'master' | Rémy Coutable | 2017-08-09 | 1 | -10/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Translations can be picked without asking for exceptions | Sean McGivern | 2017-08-09 | 1 | -5/+12 | |
| * | | | | | | | | Ask for exceptions in advance | Sean McGivern | 2017-08-09 | 1 | -5/+15 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'rc/cob-do-not-require-stackprof' into 'master' | Sean McGivern | 2017-08-09 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Don't require stackprof in Gemfile | Rémy Coutable | 2017-08-09 | 2 | -2/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'update-source-install-docs-with-i18n' into 'master' | Rémy Coutable | 2017-08-09 | 5 | -9/+37 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Update docs with i18n info for source installationsupdate-source-install-docs-with-i18n | Rubén Dávila | 2017-08-08 | 5 | -9/+37 | |
* | | | | | | | | Merge branch '34339-user_avatar-url-in-push-event-webhook-json-payload-is-rel... | Rémy Coutable | 2017-08-09 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute | blackst0ne | 2017-08-09 | 2 | -1/+5 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master' | Rémy Coutable | 2017-08-09 | 1 | -8/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Synchronous Korean translation in zanata | 黄涛 | 2017-08-09 | 1 | -8/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'patch-24' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update README.md with a more flexible sentence | Paolo Falomo | 2017-08-07 | 1 | -1/+1 | |
| * | | | | | | | there are 3 dots but it says four products. fixed | Paolo Falomo | 2017-07-27 | 1 | -1/+1 | |
* | | | | | | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove trailing comma in System Hooks payload examples | Mark Fletcher | 2017-08-08 | 1 | -7/+7 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'sh-structured-log-docs' into 'master' | Achilleas Pipinellis | 2017-08-09 | 1 | -0/+27 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add docs on structured logging in GitLabsh-structured-log-docs | Stan Hu | 2017-08-08 | 1 | -0/+27 | |
* | | | | | | | | Merge branch 'winh-restore-blob-fixture' into 'master' | Filipa Lacerda | 2017-08-08 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Restore blob fixture for JavaScript testswinh-restore-blob-fixture | winh | 2017-08-08 | 1 | -0/+29 | |
|/ / / / / / / | ||||||
* | | | | | | | Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspec | Robert Speicher | 2017-08-08 | 1 | -4/+4 | |
* | | | | | | | Merge branch 'add-rubocop-gitlab-security' into 'master' | Robert Speicher | 2017-08-08 | 34 | -48/+90 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Re-enable SqlInjection and CommandInjection | Brian Neel | 2017-08-08 | 34 | -48/+90 | |
* | | | | | | | | Merge branch 'fly-out-nav-collapsed' into 'master' | Annabel Dunstone Gray | 2017-08-08 | 3 | -9/+78 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix fly-out navigation not showing for active items in collapsed sidebar | Phil Hughes | 2017-08-08 | 3 | -9/+78 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch '36168-fix-transient-preferences-specs' into 'master' | Sean McGivern | 2017-08-08 | 1 | -12/+16 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specs | Rémy Coutable | 2017-08-08 | 1 | -12/+16 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'remove-repo-editor-feature-flag' into 'master' | Jacob Schatz | 2017-08-08 | 4 | -27/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flag | Mike Greiling | 2017-08-08 | 3 | -3/+0 | |
| * | | | | | | | | hide the feature flag for the repo editor feature | Mike Greiling | 2017-08-08 | 1 | -22/+0 | |
| * | | | | | | | | Revert "Combine 'turn on/off' user dropdown links into 'experimental features... | Mike Greiling | 2017-08-08 | 5 | -5/+7 | |
* | | | | | | | | | Merge branch '36169-fix-master' into 'master' | Sean McGivern | 2017-08-08 | 1 | -13/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix a broken Events API spec36169-fix-master | Rémy Coutable | 2017-08-08 | 1 | -13/+8 | |
* | | | | | | | | | | Merge branch 'gitaly-bundle-gemfile' into 'master' | Rémy Coutable | 2017-08-08 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Unset BUNDLE_GEMFILE when installing Gitaly | Jacob Vosmaer | 2017-08-08 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-... | Rémy Coutable | 2017-08-08 | 5 | -8/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one | blackst0ne | 2017-08-08 | 5 | -8/+29 | |
* | | | | | | | | | | | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace... | Filipa Lacerda | 2017-08-08 | 7 | -4/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui | Simon Knox | 2017-08-08 | 7 | -4/+84 | |
* | | | | | | | | | | | | Merge branch 'fly-out-min-width' into 'master' | Annabel Dunstone Gray | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix fly-out width when it has long itemsfly-out-min-width | Phil Hughes | 2017-08-08 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'gitaly-find-commit' into 'master' | Dmitriy Zaporozhets | 2017-08-08 | 20 | -158/+180 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commit | Alejandro Rodríguez | 2017-08-07 | 9 | -26/+76 | |
| * | | | | | | | | | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit | Alejandro Rodríguez | 2017-08-07 | 7 | -53/+46 | |
| * | | | | | | | | | | | Refactor Gitlab::Git::Commit to include a repository | Alejandro Rodríguez | 2017-08-07 | 15 | -85/+64 | |
* | | | | | | | | | | | | Merge branch 'header-z-index-fix' into 'master' | Annabel Dunstone Gray | 2017-08-08 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fixed modals being below navbarheader-z-index-fix | Phil Hughes | 2017-08-07 | 2 | -1/+3 | |
* | | | | | | | | | | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master' | Sean McGivern | 2017-08-08 | 5 | -1/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make sure that we have author and committer | Lin Jen-Shin | 2017-08-08 | 1 | -0/+3 | |
| * | | | | | | | | | | | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-threshold | Lin Jen-Shin | 2017-08-08 | 3 | -0/+94 |