| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_version | Sean McGivern | 2017-12-12 | 6 | -10/+181 |
|\ |
|
| * | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15 | Sophie Herold | 2017-12-11 | 6 | -10/+181 |
* | | Merge branch 'repo-write-ref-client-prep' into 'master' | Robert Speicher | 2017-12-12 | 5 | -16/+35 |
|\ \ |
|
| * | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prep | Kim "BKC" Carlbäcker | 2017-12-12 | 5 | -16/+35 |
* | | | Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master' | Sean McGivern | 2017-12-12 | 3 | -2/+27 |
|\ \ \ |
|
| * | | | Treat empty markdown and html strings as valid cached text, not missing cache...optimize-issues-avoid-noop-empty-cache-updates2 | Greg Stark | 2017-12-12 | 3 | -2/+27 |
* | | | | Merge branch 'single-list-multiple-clusters' into 'master' | Kamil Trzciński | 2017-12-12 | 6 | -68/+13 |
|\ \ \ \ |
|
| * | | | | Remove Add Cluster button in clusters/indexsingle-list-multiple-clusters | Matija Čupić | 2017-12-11 | 1 | -2/+0 |
| * | | | | Change copy on list header | Chris Peressini | 2017-12-11 | 1 | -1/+1 |
| * | | | | Add CHANGELOG entry | Matija Čupić | 2017-12-11 | 1 | -0/+5 |
| * | | | | Remove tab navigation from clusters/index | Matija Čupić | 2017-12-11 | 3 | -35/+8 |
| * | | | | Remove cluster scope from ClustersController#index | Matija Čupić | 2017-12-11 | 2 | -33/+2 |
* | | | | | Merge branch 'rc/backport-ee-fix' into 'master' | Kamil Trzciński | 2017-12-12 | 1 | -18/+8 |
|\ \ \ \ \ |
|
| * | | | | | Backport a spec fix done in EE (5dbecb8e) to CE | Rémy Coutable | 2017-12-11 | 1 | -18/+8 |
* | | | | | | Merge branch 'jprovazn-description' into 'master' | Sean McGivern | 2017-12-12 | 5 | -2/+37 |
|\ \ \ \ \ \ |
|
| * | | | | | | Use message body for merge request descriptionjprovazn-description | Jan Provaznik | 2017-12-11 | 5 | -2/+37 |
* | | | | | | | Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-lo... | Douwe Maan | 2017-12-12 | 1 | -0/+6 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Clears the current Appearance cache otherwise it breaks since new_project_gui...41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache | Rémy Coutable | 2017-12-12 | 1 | -0/+6 |
|/ / / / / / / |
|
* | | | | | | | Merge branch 'add-js-prefix-issuable-edit' into 'master' | Filipa Lacerda | 2017-12-12 | 6 | -8/+8 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Add js prefix for issuable-editadd-js-prefix-issuable-edit | Clement Ho | 2017-12-08 | 6 | -8/+8 |
* | | | | | | | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master' | Filipa Lacerda | 2017-12-12 | 4 | -168/+255 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-build | Eric Eastwood | 2017-12-11 | 2 | -205/+215 |
| * | | | | | | | | Try to clean up legit Vue error that was patched over | Eric Eastwood | 2017-12-10 | 3 | -25/+92 |
| * | | | | | | | | Add Vue errorHandlor to remove rogue logged TypeErrors | Eric Eastwood | 2017-12-10 | 1 | -1/+11 |
* | | | | | | | | | Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master' | Filipa Lacerda | 2017-12-12 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Updated image for diff navigation docsdiff-file-navigation-doc-screenshot-docs | Phil Hughes | 2017-12-12 | 1 | -0/+0 |
* | | | | | | | | | | Merge branch 'dm-image-blob-diff-full-url' into 'master' | Sean McGivern | 2017-12-12 | 6 | -21/+39 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-url | Douwe Maan | 2017-12-12 | 6 | -21/+39 |
* | | | | | | | | | | | Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal... | Kamil Trzciński | 2017-12-12 | 2 | -8/+22 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build | Shinya Maeda | 2017-12-12 | 2 | -8/+22 |
* | | | | | | | | | | | | Merge branch '40997-pipeline-null' into 'master' | Phil Hughes | 2017-12-12 | 2 | -11/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Check for null in job tooltip title40997-pipeline-null | Filipa Lacerda | 2017-12-11 | 2 | -11/+61 |
* | | | | | | | | | | | | Merge branch 'milestone-sidebar-docs' into 'master' | Sean McGivern | 2017-12-12 | 3 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Milestone sidebar docs | Victor Wu | 2017-12-12 | 3 | -4/+6 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge branch 'fix-remove-branch-name-migration' into 'master' | Sean McGivern | 2017-12-12 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Fix migration that removes issues.branch_namefix-remove-branch-name-migration | Yorick Peterse | 2017-12-11 | 2 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'winh-i18n-placeholder-names' into 'master' | Tim Zallmann | 2017-12-12 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Clarify casing of I18N placeholder nameswinh-i18n-placeholder-names | Winnie Hellmann | 2017-12-11 | 1 | -0/+3 |
* | | | | | | | | | | | | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master' | Tim Zallmann | 2017-12-12 | 15 | -47/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignment | Eric Eastwood | 2017-12-08 | 15 | -47/+34 |
| | |_|_|_|/ / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge branch 'issue-note-rename' into 'master' | Fatih Acet | 2017-12-11 | 13 | -36/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | rename remaining issue_ prefixed filesissue-note-rename | Simon Knox | 2017-12-09 | 13 | -36/+36 |
* | | | | | | | | | | | | | | Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master' | Stan Hu | 2017-12-11 | 2 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Ignore temporary table in schema | Michael Kozono | 2017-12-11 | 2 | -0/+7 |
| | |_|_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge branch 'gitaly-mirroring-prep' into 'master' | Robert Speicher | 2017-12-11 | 4 | -55/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prep | Alejandro Rodríguez | 2017-12-06 | 3 | -19/+20 |
| * | | | | | | | | | | | | | | Add feature flag to use gitaly-ssh mirroring when cloning internal repos | Alejandro Rodríguez | 2017-12-06 | 3 | -38/+28 |
* | | | | | | | | | | | | | | | Merge branch 'backport-epic-in-issue' into 'master' | Jacob Schatz | 2017-12-11 | 11 | -82/+151 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Backport epic in issueepic-in-issuebackport-epic-in-issue | Clement Ho | 2017-12-07 | 11 | -82/+151 |
* | | | | | | | | | | | | | | | Merge branch 'fix_js_style_guide_markup' into 'master' | Rémy Coutable | 2017-12-11 | 1 | -62/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ / / / / / / /
|/| | | | | | | | | | | | | | |
|