summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Make new .dropdown-header style globalWinnie Hellmann2017-12-081-6/+2
| * | | | | | Make new style .divider globalWinnie Hellmann2017-12-081-15/+5
| * | | | | | Make new .dropdown-open-top style globalWinnie Hellmann2017-12-081-4/+4
* | | | | | | Merge branch 'remove-unnecessary-js-issuable-edit' into 'master'Filipa Lacerda2017-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary js-issuable-editremove-unnecessary-js-issuable-editClement Ho2017-12-121-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-127-13/+57
|\ \ \ \ \ \ \
| * | | | | | | Fix rubocop offenceZeger-Jan van de Weg2017-12-121-1/+0
| * | | | | | | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-127-13/+58
* | | | | | | | Merge branch 'optimize-projects-for-imported-projects' into 'master'Yorick Peterse2017-12-122-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | check the import_status field before doing SQL operations to check the import...Greg Stark2017-12-122-1/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_versionSean McGivern2017-12-126-10/+181
|\ \ \ \ \ \ \ \
| * | | | | | | | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-116-10/+181
* | | | | | | | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-125-16/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-125-16/+35
* | | | | | | | | | Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'Sean McGivern2017-12-123-2/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Treat empty markdown and html strings as valid cached text, not missing cache...optimize-issues-avoid-noop-empty-cache-updates2Greg Stark2017-12-123-2/+27
* | | | | | | | | | Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-126-68/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove Add Cluster button in clusters/indexsingle-list-multiple-clustersMatija Čupić2017-12-111-2/+0
| * | | | | | | | | | Change copy on list headerChris Peressini2017-12-111-1/+1
| * | | | | | | | | | Add CHANGELOG entryMatija Čupić2017-12-111-0/+5
| * | | | | | | | | | Remove tab navigation from clusters/indexMatija Čupić2017-12-113-35/+8
| * | | | | | | | | | Remove cluster scope from ClustersController#indexMatija Čupić2017-12-112-33/+2
* | | | | | | | | | | Merge branch 'rc/backport-ee-fix' into 'master'Kamil Trzciński2017-12-121-18/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport a spec fix done in EE (5dbecb8e) to CERémy Coutable2017-12-111-18/+8
* | | | | | | | | | | | Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-125-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use message body for merge request descriptionjprovazn-descriptionJan Provaznik2017-12-115-2/+37
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-lo...Douwe Maan2017-12-121-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-cacheRémy Coutable2017-12-121-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-126-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-086-8/+8
* | | | | | | | | | | | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'Filipa Lacerda2017-12-124-168/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-buildEric Eastwood2017-12-112-205/+215
| * | | | | | | | | | | | | Try to clean up legit Vue error that was patched overEric Eastwood2017-12-103-25/+92
| * | | | | | | | | | | | | Add Vue errorHandlor to remove rogue logged TypeErrorsEric Eastwood2017-12-101-1/+11
* | | | | | | | | | | | | | Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master'Filipa Lacerda2017-12-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated image for diff navigation docsdiff-file-navigation-doc-screenshot-docsPhil Hughes2017-12-121-0/+0
* | | | | | | | | | | | | | | Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-126-21/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-urlDouwe Maan2017-12-126-21/+39
* | | | | | | | | | | | | | | | Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-122-8/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-buildShinya Maeda2017-12-122-8/+22
* | | | | | | | | | | | | | | | | Merge branch '40997-pipeline-null' into 'master'Phil Hughes2017-12-122-11/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Check for null in job tooltip title40997-pipeline-nullFilipa Lacerda2017-12-112-11/+61
* | | | | | | | | | | | | | | | | Merge branch 'milestone-sidebar-docs' into 'master'Sean McGivern2017-12-123-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Milestone sidebar docsVictor Wu2017-12-123-4/+6
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-122-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix migration that removes issues.branch_namefix-remove-branch-name-migrationYorick Peterse2017-12-112-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'winh-i18n-placeholder-names' into 'master'Tim Zallmann2017-12-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Clarify casing of I18N placeholder nameswinh-i18n-placeholder-namesWinnie Hellmann2017-12-111-0/+3
* | | | | | | | | | | | | | | | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-1215-47/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignmentEric Eastwood2017-12-0815-47/+34
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |