Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-14Merge branch ↵Douwe Maan
'37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
2017-09-14Merge branch 'zj-auto-devops-banner' into 'master'Kamil Trzciński
AutoDevOps banner hidden on explicit CI config Closes #37652 See merge request !14207
2017-09-14Merge branch 'zj-feature-flipper-disable-banner' into 'master'Kamil Trzciński
Allow all AutoDevOps banners to be disabled Closes #37653 See merge request !14218
2017-09-12Merge branch 'user-recent-push' into 'master'Douwe Maan
Rework how recent push events are retrieved Closes #35990 See merge request !13995
2017-09-08Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan
Update master with 9.5.4 security patches See merge request !14131
2017-09-07Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan
Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944
2017-09-07Merge branch '37158-autodevops-banner' into 'master'Kamil Trzciński
Resolve "Banner to enable Auto DevOps at project level" Closes #37158 See merge request !13991
2017-09-07Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski
2017-09-07Merge branch '31362_decrease_cyclomatic_complexity_threshold_step3' into ↵Rémy Coutable
'master' Decrease Cyclomatic Complexity threshold to 14 See merge request !13972
2017-09-07Merge branch ↵Sean McGivern
'35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
2017-09-07Small refactor after last code review.Ruben Davila
2017-09-07Use indigo as default themeAnnabel Dunstone Gray
2017-09-07Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into ↵Kamil Trzcinski
37158-autodevops-banner
2017-09-07remove unnecessary args from `link_to_member_avatar` method in ↵Maxim Rydkin
`app/helpers/projects_helper.rb`
2017-09-07fix project_helper.rb and add couple specs to itMaxim Rydkin
2017-09-07fix CIMaxim Rydkin
2017-09-07fix helper and specMaxim Rydkin
2017-09-07refactor `app/helpers/projects_helper.rb:21:3`Maxim Rydkin
2017-09-06Implement fix for n+1 issue on `flatten_tree` helperAlejandro Rodríguez
2017-09-06Add specs for AutoDevopsHelperKamil Trzcinski
2017-09-06Refer to “Share with group lock” consistentlyMichael Kozono
2017-09-06Link or not link depending on permissionsMichael Kozono
2017-09-06Link to ancestor settings pageMichael Kozono
2017-09-06Fix “Share lock” help textMichael Kozono
2017-09-06Fix specs; start on light themeAnnabel Dunstone Gray
2017-09-06Restore some changes from !9199Rubén Dávila
2017-09-06Merge branch ↵Douwe Maan
'34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
2017-09-06Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern
First time contributor badge Closes #35161 See merge request !13902
2017-09-06Merge branch '35441-fix-division-by-zero' into 'master'Robert Speicher
Fix division by zero for blame age map Closes #35441 See merge request !13803
2017-09-06Merge branch 'generalize-profile-updates' into 'master'Douwe Maan
Profile updates from providers See merge request !12968
2017-09-06Merge branch 'breadcrumbs-improvements' into 'master'Filipa Lacerda
Improvements to breadcrumbs Closes #35269 and #36460 See merge request !13582
2017-09-06Adds cacheless render to Banzai object renderTiago Botelho
2017-09-06Profile updates from providersAlexander Keramidas
2017-09-06WIP: refactor the first-contributor to Issuablemicael.bergeron
this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
2017-09-06fix #35161, add a first-time contributor badgemicael.bergeron
a new badge will be added when an user that doesn't yet have any merged merge request is discussing on either issues or merge requests that he created. this is indented for people to use extra care when discussing with a new contributor.
2017-09-06Merge branch ↵Douwe Maan
'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
2017-09-06Merge branch ↵Rémy Coutable
'19650-remove-admin-section-from-search-results-if-user-doesnt-have-access' into 'master' Hide admin link from default search results for non-admins Closes #19650 See merge request !14015
2017-09-06Resolve outdated diff discussions on pushSean McGivern
2017-09-06Hide admin link from default search results for non-adminsMark Fletcher
2017-09-06Refactor blame helper age class testsJeff Stubler
2017-09-05removed comment from helper specPhil Hughes
2017-09-05Merge branch 'master' into breadcrumbs-improvementsPhil Hughes
2017-09-04rspec test fixesPhil Hughes
2017-09-04Merge branch 'remove-unused-code-issueshelper' into 'master'Rémy Coutable
Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793
2017-09-04Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas
2017-09-01Merge branch 'remove-finder-caching' into 'master'Robert Speicher
Remove issuable finder count caching See merge request !13959
2017-09-01Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski
2017-08-31Merge branch ↵Tim Zallmann
'31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
2017-08-31`current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
2017-08-31Remove issuable finder count cachingSean McGivern
We're going to cache the total open count separately, and then just perform these counts on the list. We already do that to get the pagination information, through Kaminari, and a future change will make Kaminari reuse the query results from earlier in the request.